public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Rspamd, Web] Add rewrite subject to known soft quarantine actions

5d9c40b8

andryyy <[email protected]> 6 years ago

data/conf/rspamd/local.d/metadata_exporter.conf | 2 +-
 data/web/js/site/qhandler.js                    | 6 ++++--
 data/web/js/site/quarantine.js                  | 6 +++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

Diff

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('<span class="label-rspamd-action label label-warning"><b>' + data.score + '</b> - ' + lang.junk_folder + '</span>');
-        } else {
+        } else if (data.action === "reject") {
           $('#qid_detail_score').append('<span class="label-rspamd-action label label-danger"><b>' + data.score + '</b> - ' + lang.rejected + '</span>');
+        } else if (data.action === "rewrite subject") {
+          $('#qid_detail_score').append('<span class="label-rspamd-action label label-warning"><b>' + data.score + '</b> - ' + lang.rewrite_subject + '</span>');
         }
       }
       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 = '<span class="label label-danger">' + lang.rejected + '</span>';
             } else if (item.action === "add header") {
               item.rspamdaction = '<span class="label label-warning">' + lang.junk_folder + '</span>';
+            } else if (item.action === "rewrite subject") {
+              item.rspamdaction = '<span class="label label-warning">' + lang.rewrite_subject + '</span>';
             }
             if(item.notified > 0) {
               item.notified = '&#10004;';
@@ -182,8 +184,10 @@ jQuery(function($){
         if (typeof data.score !== 'undefined' && typeof data.action !== 'undefined') {
           if (data.action == "add header") {
             $('#qid_detail_score').append('<span class="label-rspamd-action label label-warning"><b>' + data.score + '</b> - ' + lang.junk_folder + '</span>');
-          } else {
+          } else if (data.action == "reject") {
             $('#qid_detail_score').append('<span class="label-rspamd-action label label-danger"><b>' + data.score + '</b> - ' + lang.rejected + '</span>');
+          } else if (data.action == "rewrite subject") {
+            $('#qid_detail_score').append('<span class="label-rspamd-action label label-warning"><b>' + data.score + '</b> - ' + lang.rewrite_subject + '</span>');
           }
         }
         if (typeof data.recipients !== 'undefined') {