From bc775b7daba0704271ffce21636ee933fac14aa8 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Sun, 4 Mar 2018 14:35:02 +0100 Subject: [PATCH] add amavis sa_spam_level_char and sa_dsn_cutoff_level --- spam/edit_amavisd.cgi | 24 +++++++++++++++++------- spam/lang/.en.swp | Bin 20480 -> 0 bytes spam/save_amavisd.cgi | 12 ++++++++++-- 3 files changed, 27 insertions(+), 9 deletions(-) delete mode 100644 spam/lang/.en.swp diff --git a/spam/edit_amavisd.cgi b/spam/edit_amavisd.cgi index 075f4a2fc..877611502 100755 --- a/spam/edit_amavisd.cgi +++ b/spam/edit_amavisd.cgi @@ -28,12 +28,17 @@ print &text('amavisd_desc'),"

\n"; # spam tag2 level, when is classiefied as spam $hits = &amavis_find('sa_tag2_level_deflt', $conf); print &ui_table_row($text{'amavis_hits'}, - &opt_field('sa_tag2_level_deflt', $hits, 7, 6.5)); + &opt_field('sa_tag2_level_deflt', $hits, 5, "undef")); # amavis quarantine spam level $hits = &amavis_find('sa_kill_level_deflt', $conf); print &ui_table_row($text{'amavis_quarantine_level'}, - &opt_field('sa_kill_level_deflt', $hits, 7, 6.5)); + &opt_field('sa_kill_level_deflt', $hits, 5, "undef")); + +# amavis no DSN spam level +$hits = &amavis_find('sa_dsn_cutoff_level', $conf); +print &ui_table_row($text{'amavis_dsn_level'}, + &opt_field('sa_dsn_cutoff_level', $hits, 5, "undef")); # amavis delete spam level $hits = &amavis_find('sa_quarantine_cutoff_level', $conf); @@ -44,7 +49,7 @@ print &ui_table_hr(); # should amavis rewrite subject $rewrite = &amavis_find('sa_spam_modifies_subj', $conf); print &ui_table_row($text{'amavis_rewrite'}, - &yes_no_field('sa_spam_modifies_subj', $rewrite, 0)); + &yes_no_field('sa_spam_modifies_subj', $rewrite, "undef")); # do how to modify subject $hits = &amavis_find('sa_spam_subject_tag', $conf); @@ -56,16 +61,21 @@ $hits = &amavis_find('sa_spam_report_header', $conf); print &ui_table_row($text{'amavis_report_header'}, &yes_no_field('sa_spam_report_header', $hits, 0)); -# do not check mail larger then -$hits = &amavis_find('sa_mail_body_size_limit', $conf); -print &ui_table_row($text{'amavis_size_limit'}, - &opt_field('sa_mail_body_size_limit', $hits, 9, "undef")); +# character to use for spam level +$hits = &amavis_find('sa_spam_level_char', $conf); +print &ui_table_row($text{'amavis_level_char'}, + &opt_field('sa_spam_level_char', $hits, 2, "*")); # network checks enabled? $rewrite = &amavis_find('sa_local_tests_only', $conf); print &ui_table_row($text{'amavis_local_only'}, &yes_no_field('sa_local_tests_only', $rewrite, 0)); +# do not check mail larger then +$hits = &amavis_find('sa_mail_body_size_limit', $conf); +print &ui_table_row($text{'amavis_size_limit'}, + &opt_field('sa_mail_body_size_limit', $hits, 9, "undef")); + &end_form(undef, $text{'amavis_ok'}); diff --git a/spam/lang/.en.swp b/spam/lang/.en.swp deleted file mode 100644 index ebb236e198c338126d167342f053f0a0ffb020f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 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 QNc!IAq}=eO(52{q07HAjf&c&j diff --git a/spam/save_amavisd.cgi b/spam/save_amavisd.cgi index e1e50f93d..49fb2eb04 100755 --- a/spam/save_amavisd.cgi +++ b/spam/save_amavisd.cgi @@ -12,9 +12,11 @@ $conf = &get_amavis_config(); # check for default values local $tag2=$in{'sa_tag2_level_deflt'}; -$tag2=6.5 if ($in{'sa_tag2_level_deflt_def'}==1); +$tag2="undef" if ($in{'sa_tag2_level_deflt_def'}==1); local $kill=$in{'sa_kill_level_deflt'}; -$kill=6.5 if ($in{'sa_kill_level_deflt_def'}==1); +$kill="undef" if ($in{'sa_kill_level_deflt_def'}==1); +local $dsn=$in{'sa_dsn_cutoff_level'}; +$dsn="undef" if ($in{'sa_dsn_cutoff_level_def'}==1); local $cut=$in{'sa_quarantine_cutoff_level'}; $cut="undef" if ($in{'sa_quarantine_cutoff_level_def'}==1); local $subj=$in{'sa_spam_modifies_subj'}; @@ -23,6 +25,8 @@ local $subtag=$in{'sa_spam_subject_tag'}; $subtag="undef" if ($in{'sa_spam_subject_tag_def'}==1); local $head=$in{'sa_spam_report_header'}; $head=0 if ($in{'sa_spam_report_header'}==-1); +local $char=$in{'sa_spam_level_char'}; +$char="*" if ($in{'sa_spam_level_char_def'}==1); local $size=$in{'sa_mail_body_size_limit'}; $size="undef" if ($in{'sa_mail_body_size_limit_def'}==1); local $local=$in{'sa_local_tests_only'}; @@ -34,6 +38,8 @@ $local=0 if ($in{'sa_local_tests_only'}==-1); &error($text{'amavis_ehit'}); &check_amavis_value($kill, 1) || &error($text{'amavis_ekill'}); +&check_amavis_value($dsn, 1) || + &error($text{'amavis_edsn'}); &check_amavis_value($cut, 1) || &error($text{'amavis_ecut'}); &check_amavis_value($subj, 1) || @@ -48,10 +54,12 @@ $local=0 if ($in{'sa_local_tests_only'}==-1); # Save inputs &save_amavis_directive($conf, 'sa_tag2_level_deflt', $tag2); &save_amavis_directive($conf, "sa_kill_level_deflt", $kill); +&save_amavis_directive($conf, "sa_dsn_cutoff_level", $dsn); &save_amavis_directive($conf, "sa_quarantine_cutoff_level", $cut); &save_amavis_directive($conf, "sa_spam_modifies_subj", $subj); &save_amavis_directive($conf, "sa_spam_subject_tag", $subtag); &save_amavis_directive($conf, "sa_spam_report_header", $head); +&save_amavis_directive($conf, "sa_spam_level_char", $char); &save_amavis_directive($conf, "sa_mail_body_size_limit", $size); &save_amavis_directive($conf, "sa_local_tests_only", $local);