From d18cc2c6927fbc8ca038ee94e4f7e86991e96b9a Mon Sep 17 00:00:00 2001 From: IKEDA Soji Date: Thu, 25 Aug 2022 14:40:26 +0900 Subject: [PATCH 1/4] These parameters are obsoleted: - antispam_tag_header_name - antispam_tag_header_spam_regexp - antispam_tag_header_ham_regexp --- src/lib/Sympa/Config/Schema.pm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/lib/Sympa/Config/Schema.pm b/src/lib/Sympa/Config/Schema.pm index 6dc9aa661..26bbd2d88 100644 --- a/src/lib/Sympa/Config/Schema.pm +++ b/src/lib/Sympa/Config/Schema.pm @@ -2378,6 +2378,7 @@ our %pinfo = ( gettext_id => 'Tag based spam filtering', format => ['on', 'off'], default => 'off', + not_before => '6.0a.1', }, antispam_tag_header_name => { context => [qw(domain site)], @@ -2387,7 +2388,10 @@ our %pinfo = ( gettext_id => 'Header field to tag spams', gettext_comment => 'If a spam filter (like spamassassin or j-chkmail) add a header field to tag spams, name of this header field (example X-Spam-Status)', - format => '\S+', + format => '\S+', + obsolete => 1, + not_before => '6.0a.1', + not_after => '6.1a.1', }, antispam_tag_header_spam_regexp => { context => [qw(domain site)], @@ -2397,7 +2401,10 @@ our %pinfo = ( gettext_id => 'Regular expression to check header field to tag spams', gettext_comment => 'Regular expression applied on this header to verify message is a spam (example Yes)', - format => '.+', #FIXME: Check regexp + format => '.+', #FIXME: Check regexp + obsolete => 1, + not_before => '6.0a.1', + not_after => '6.1a.1', }, antispam_tag_header_ham_regexp => { context => [qw(domain site)], @@ -2407,7 +2414,10 @@ our %pinfo = ( gettext_id => 'Regular expression to determine spam or ham.', gettext_comment => 'Regular expression applied on this header field to verify message is NOT a spam (example No)', - format => '.+', #FIXME: Check regexp + format => '.+', #FIXME: Check regexp + obsolete => 1, + not_before => '6.0a.1', + not_after => '6.1a.1', }, spam_status => { context => [qw(domain site)], @@ -2417,7 +2427,8 @@ our %pinfo = ( gettext_id => 'Name of header field to inform', gettext_comment => 'Messages are supposed to be filtered by an spam filter that adds them one or more headers. This parameter is used to select a special scenario in order to decide the message\'s spam status: ham, spam or unsure. This parameter replaces antispam_tag_header_name, antispam_tag_header_spam_regexp and antispam_tag_header_ham_regexp.', - scenario => 'spam_status', + scenario => 'spam_status', + not_before => '6.1a.2', }, ### Directories From ba7db4b5ab8c79c93547d1767452a24fa449d73b Mon Sep 17 00:00:00 2001 From: IKEDA Soji Date: Sun, 4 Sep 2022 07:22:39 +0900 Subject: [PATCH 2/4] antispam_feature was obsoleted. Use spam_status.* scenario instead. Added scenarios: * spam_status.bogofilter * spam_status.j-chkmail (separated from spam_status.x-spam-status) * spam_status.none * spam_status.rspamd * spam_status.spamassassin --- default/Makefile.am | 5 +++++ default/scenari/spam_status.bogofilter | 6 ++++++ default/scenari/spam_status.j-chkmail | 6 ++++++ default/scenari/spam_status.none | 3 +++ default/scenari/spam_status.rspamd | 6 ++++++ default/scenari/spam_status.spamassassin | 7 +++++++ default/scenari/spam_status.x-spam-status | 6 ++---- default/web_tt2/modindex.tt2 | 14 ++++++-------- doc/sympa_config.podpl | 2 +- src/cgi/wwsympa.fcgi.in | 3 ++- src/lib/Sympa/Config/Schema.pm | 2 ++ 11 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 default/scenari/spam_status.bogofilter create mode 100644 default/scenari/spam_status.j-chkmail create mode 100644 default/scenari/spam_status.none create mode 100644 default/scenari/spam_status.rspamd create mode 100644 default/scenari/spam_status.spamassassin diff --git a/default/Makefile.am b/default/Makefile.am index d1e96666c..89cfdbee9 100644 --- a/default/Makefile.am +++ b/default/Makefile.am @@ -131,6 +131,11 @@ nobase_default_DATA = \ scenari/send.publicnoattachment \ scenari/send.public_nobcc \ scenari/send.publicnomultipart \ + scenari/spam_status.bogofilter \ + scenari/spam_status.j-chkmail \ + scenari/spam_status.none \ + scenari/spam_status.rspamd \ + scenari/spam_status.spamassassin \ scenari/spam_status.x-spam-status \ scenari/subscribe.auth \ scenari/subscribe.authdkim \ diff --git a/default/scenari/spam_status.bogofilter b/default/scenari/spam_status.bogofilter new file mode 100644 index 000000000..b403d04f1 --- /dev/null +++ b/default/scenari/spam_status.bogofilter @@ -0,0 +1,6 @@ +title bogofilter + +match([header->X-Bogosity][-1],/^(Spam|Yes)\b/) smtp,dkim,md5,smime -> spam +match([header->X-Bogosity][-1],/^(Ham|No)\b/) smtp,dkim,md5,smime -> ham +match([header->X-Bogosity][-1],/^Unsure\b/) smtp,dkim,md5,smime -> unsure +true() smtp,dkim,md5,smime -> unsure diff --git a/default/scenari/spam_status.j-chkmail b/default/scenari/spam_status.j-chkmail new file mode 100644 index 000000000..3d580a70d --- /dev/null +++ b/default/scenari/spam_status.j-chkmail @@ -0,0 +1,6 @@ +title j-chkmail + +match([header->X-j-chkmail-Status][-1],/Spam Hi/) smtp,dkim,md5,smime -> spam +match([header->X-j-chkmail-Status][-1],/Spam Low/) smtp,dkim,md5,smime -> unsure +match([header->X-j-chkmail-Status][-1],/Unsure/) smtp,dkim,md5,smime -> unsure +true() smtp,dkim,md5,smime -> ham diff --git a/default/scenari/spam_status.none b/default/scenari/spam_status.none new file mode 100644 index 000000000..4f412141a --- /dev/null +++ b/default/scenari/spam_status.none @@ -0,0 +1,3 @@ +title.gettext do nothing + +true() smtp,dkim,md5,smime -> unsure diff --git a/default/scenari/spam_status.rspamd b/default/scenari/spam_status.rspamd new file mode 100644 index 000000000..b1188b050 --- /dev/null +++ b/default/scenari/spam_status.rspamd @@ -0,0 +1,6 @@ +title Rspamd + +match([header->X-Spam][0],/^Yes/) smtp,dkim,md5,smime -> spam +match([header->X-Spam-Status][-1],/^Yes\b/) smtp,dkim,md5,smime -> spam +match([header->X-Spam-Status][-1],/^No\b/) smtp,dkim,md5,smime -> ham +true() smtp,dkim,md5,smime -> unsure diff --git a/default/scenari/spam_status.spamassassin b/default/scenari/spam_status.spamassassin new file mode 100644 index 000000000..062291f58 --- /dev/null +++ b/default/scenari/spam_status.spamassassin @@ -0,0 +1,7 @@ +title SpamAssassin + +match([header->X-Spam-Status][0],/^Yes\b/) smtp,dkim,md5,smime -> spam +match([header->X-Spam-Status][0],/^No\b/) smtp,dkim,md5,smime -> ham +match([header->X-Spam-Flag][0],/^YES/) smtp,dkim,md5,smime -> spam +match([header->X-Spam-Flag][0],/^NO/) smtp,dkim,md5,smime -> ham +true() smtp,dkim,md5,smime -> unsure diff --git a/default/scenari/spam_status.x-spam-status b/default/scenari/spam_status.x-spam-status index 5cadf6a0a..219a55aa8 100644 --- a/default/scenari/spam_status.x-spam-status +++ b/default/scenari/spam_status.x-spam-status @@ -1,6 +1,4 @@ title.gettext test x-spam-status header -match([header->X-Spam-Status][-1],/^\s*yes/) smtp,dkim,smime,md5 -> spam -match([header->X-j-chkmail-Status][-1],/Spam Hi/) smtp,dkim,smime,md5 -> spam -match([header->X-j-chkmail-Status][-1],/Spam Low/) smtp,dkim,smime,md5 -> unsure -true() smtp,dkim,md5,smime -> ham +match([header->X-Spam-Status][-1],/^\s*yes/) smtp,dkim,md5,smime -> spam +true() smtp,dkim,md5,smime -> unsure diff --git a/default/web_tt2/modindex.tt2 b/default/web_tt2/modindex.tt2 index 02f148c9d..bb9ab4ddc 100644 --- a/default/web_tt2/modindex.tt2 +++ b/default/web_tt2/modindex.tt2 @@ -47,14 +47,12 @@ - [%~ IF conf.antispam_feature == 'on' ~%] - [% IF msg.value.spam_status == 'spam' ~%] - - - - [%~ ELSE ~%] -   - [%~ END %] + [% IF msg.value.spam_status == 'spam' ~%] + + + + [%~ ELSE ~%] +   [%~ END %]
diff --git a/doc/sympa_config.podpl b/doc/sympa_config.podpl index 09e7bb41d..8609d343a 100644 --- a/doc/sympa_config.podpl +++ b/doc/sympa_config.podpl @@ -270,7 +270,7 @@ sub _format { open $fh, '<', "$function.$name" or die $ERRNO; my $content = do { local $RS; <$fh> }; close $fh; - if ($content =~ /(?:\A|\n)title(?:[.][-\w]+)\s+(.+)/) { + if ($content =~ /(?:\A|\n)title(?:[.][-\w]+)?\s+(.+)/) { $parameters .= sprintf "=item C<%s> - %s\n\n", $name, $1; } else { $parameters .= sprintf "=item C<%s>\n\n", $name; diff --git a/src/cgi/wwsympa.fcgi.in b/src/cgi/wwsympa.fcgi.in index 65acc0b01..22bea4902 100644 --- a/src/cgi/wwsympa.fcgi.in +++ b/src/cgi/wwsympa.fcgi.in @@ -1152,7 +1152,6 @@ while ($query = Sympa::WWW::FastCGI->new) { 'main_menu_custom_button_3_target', 'static_content_url', 'use_blocklist', - 'antispam_feature', 'custom_robot_parameter', 'reporting_spam_script_path', 'automatic_list_families', @@ -1178,6 +1177,8 @@ while ($query = Sympa::WWW::FastCGI->new) { # Compat. < 6.2.62: Renamed parameters. $param->{'conf'}{'use_blacklist'} = Conf::get_robot_conf($robot, 'use_blocklist'); + # Compat. < 6.2.71: Obsoleted parameter. + $param->{'conf'}{'antispam_feature'} = 'on'; $auth_services = $Conf::Conf{'auth_services'}{$robot}; $param->{'sso'} = { diff --git a/src/lib/Sympa/Config/Schema.pm b/src/lib/Sympa/Config/Schema.pm index 26bbd2d88..5209ac332 100644 --- a/src/lib/Sympa/Config/Schema.pm +++ b/src/lib/Sympa/Config/Schema.pm @@ -2378,7 +2378,9 @@ our %pinfo = ( gettext_id => 'Tag based spam filtering', format => ['on', 'off'], default => 'off', + obsolete => 1, not_before => '6.0a.1', + not_after => '6.2.70', }, antispam_tag_header_name => { context => [qw(domain site)], From 9e55c5672e1be0f9082ddd13870200871d4bf5e3 Mon Sep 17 00:00:00 2001 From: IKEDA Soji Date: Sun, 4 Sep 2022 07:52:43 +0900 Subject: [PATCH 3/4] Cleanup translation strings for the perameters no longer used --- src/lib/Sympa/Config/Schema.pm | 269 ++++++++++++--------------------- 1 file changed, 98 insertions(+), 171 deletions(-) diff --git a/src/lib/Sympa/Config/Schema.pm b/src/lib/Sympa/Config/Schema.pm index 5209ac332..21c8b91af 100644 --- a/src/lib/Sympa/Config/Schema.pm +++ b/src/lib/Sympa/Config/Schema.pm @@ -649,18 +649,16 @@ our %pinfo = ( }, host => { - context => [qw(list domain site)], - order => 10.08, - group => 'description', - gettext_id => "Internet domain", - gettext_comment => - 'Domain name of the list, default is the robot domain name set in the related robot.conf file or in file sympa.conf.', + context => [qw(list domain site)], + order => 10.08, + group => 'description', format_s => '$host', filters => ['canonic_domain'], length => 20, # Site parameter became an alias of "domain" on 6.2a.0 # List parameter no longer is available after 6.2.32 exclusive - obsolete => 1, + obsolete => 1, + not_after => '6.2.32', }, lang => { @@ -1089,22 +1087,20 @@ our %pinfo = ( }, reply_to => { - context => [qw(list)], - group => 'sending', - gettext_id => "Reply address", - format => '\S+', - default => 'sender', - obsolete => 1 + context => [qw(list)], + group => 'sending', + format => '\S+', + default => 'sender', + obsolete => 1 }, 'reply-to' => {obsolete => 'reply_to'}, replyto => {obsolete => 'reply_to'}, forced_reply_to => { - context => [qw(list)], - group => 'sending', - gettext_id => "Forced reply address", - format => '\S+', - obsolete => 1 + context => [qw(list)], + group => 'sending', + format => '\S+', + obsolete => 1 }, forced_replyto => {obsolete => 'forced_reply_to'}, 'forced_reply-to' => {obsolete => 'forced_reply_to'}, @@ -1750,19 +1746,17 @@ our %pinfo = ( }, web_archive => { - context => [qw(list domain site)], - group => 'archives', - gettext_id => "Web archives", - obsolete => '1', # Merged into archive. - not_after => '6.2a.43', - format => { + context => [qw(list domain site)], + group => 'archives', + obsolete => '1', # Merged into archive. + not_after => '6.2a.43', + format => { access => { - context => [qw(list domain site)], - order => 1, - gettext_id => "access right", - scenario => 'archive_web_access', - default => 'closed', - obsolete => 1, # Use archive.web_access + context => [qw(list domain site)], + order => 1, + scenario => 'archive_web_access', + default => 'closed', + obsolete => 1, # Use archive.web_access }, quota => { context => [qw(list site)], @@ -1774,11 +1768,10 @@ our %pinfo = ( obsolete => 1, # Use archive.quota }, max_month => { - context => [qw(list)], - order => 3, - gettext_id => "Maximum number of month archived", - format => '\d+', - length => 3, + context => [qw(list)], + order => 3, + format => '\d+', + length => 3, obsolete => 1, # Use archive.max_month } } @@ -1792,17 +1785,15 @@ our %pinfo = ( "Privilege for reading mail archives and frequency of archiving.\nDefines who can access the list's web archive.", format => { period => { - context => [qw(list)], - order => 1, - gettext_id => "frequency", - format => ['day', 'week', 'month', 'quarter', 'year'], - synonym => {'weekly' => 'week'}, + context => [qw(list)], + order => 1, + format => ['day', 'week', 'month', 'quarter', 'year'], + synonym => {'weekly' => 'week'}, obsolete => 1, # Not yet implemented. }, access => { - context => [qw(list)], - order => 2, - gettext_id => "access right", + context => [qw(list)], + order => 2, format => ['open', 'private', 'public', 'owner', 'closed'], synonym => {'open' => 'public'}, obsolete => 1, # Use archive.mail_access @@ -1909,16 +1900,13 @@ our %pinfo = ( default => '30', }, halt_rate => { - context => [qw(list site)], - order => 2, - gettext_id => "halt rate", - gettext_comment => - 'NOT USED YET. If bounce rate reaches the halt_rate, messages for the list will be halted, i.e. they are retained for subsequent moderation.', + context => [qw(list site)], + order => 2, gettext_unit => '%', format => '\d+', length => 3, default => '50', - obsolete => 1, # Not yet implemented. + obsolete => 1, # Not yet implemented. } } }, @@ -2375,7 +2363,6 @@ our %pinfo = ( context => [qw(domain site)], order => 53.00_01, group => 'antispam', - gettext_id => 'Tag based spam filtering', format => ['on', 'off'], default => 'off', obsolete => 1, @@ -2387,9 +2374,6 @@ our %pinfo = ( order => 53.00_02, group => 'antispam', default => 'X-Spam-Status', - gettext_id => 'Header field to tag spams', - gettext_comment => - 'If a spam filter (like spamassassin or j-chkmail) add a header field to tag spams, name of this header field (example X-Spam-Status)', format => '\S+', obsolete => 1, not_before => '6.0a.1', @@ -2400,10 +2384,7 @@ our %pinfo = ( order => 53.00_03, group => 'antispam', default => '^\s*Yes', - gettext_id => 'Regular expression to check header field to tag spams', - gettext_comment => - 'Regular expression applied on this header to verify message is a spam (example Yes)', - format => '.+', #FIXME: Check regexp + format => '.+', #FIXME: Check regexp obsolete => 1, not_before => '6.0a.1', not_after => '6.1a.1', @@ -2413,10 +2394,7 @@ our %pinfo = ( order => 53.00_04, group => 'antispam', default => '^\s*No', - gettext_id => 'Regular expression to determine spam or ham.', - gettext_comment => - 'Regular expression applied on this header field to verify message is NOT a spam (example No)', - format => '.+', #FIXME: Check regexp + format => '.+', #FIXME: Check regexp obsolete => 1, not_before => '6.0a.1', not_after => '6.1a.1', @@ -2974,12 +2952,11 @@ our %pinfo = ( }, user_data_source => { - context => [qw(list)], - group => 'data_source', - gettext_id => "User data source", - format => '\S+', - default => 'include2', - obsolete => 1, + context => [qw(list)], + group => 'data_source', + format => '\S+', + default => 'include2', + obsolete => 1, }, include_file => { @@ -3091,7 +3068,6 @@ our %pinfo = ( include_list => { context => [qw(list)], group => 'data_source', - gettext_id => "List inclusion", format_s => '$listname(\@$host)?(\s+filter\s+.+)?', occurrence => '0-n', obsolete => 1, # See include_sympa_list @@ -3208,10 +3184,8 @@ our %pinfo = ( length => 20 }, cert => { - context => [qw(list)], - order => 4.8, - gettext_id => - "certificate for authentication by remote Sympa", + context => [qw(list)], + order => 4.8, format => ['robot', 'list'], default => 'list', obsolete => 1, @@ -3300,12 +3274,10 @@ our %pinfo = ( occurrence => '1' }, port => { - context => [qw(list)], - order => 2.1, - gettext_id => "remote port", - format => '\d+', - obsolete => 1, - length => 4 + context => [qw(list)], + format => '\d+', + obsolete => 1, + length => 4 }, use_tls => { context => [qw(list)], @@ -3319,8 +3291,6 @@ our %pinfo = ( }, use_ssl => { context => [qw(list)], - #order => 2.5, - #gettext_id => 'use SSL (LDAPS)', #format => ['yes', 'no'], #default => 'no' obsolete => 'use_tls', @@ -3476,12 +3446,10 @@ our %pinfo = ( occurrence => '1' }, port => { - context => [qw(list)], - order => 2.1, - gettext_id => "remote port", - format => '\d+', - obsolete => 1, - length => 4 + context => [qw(list)], + format => '\d+', + obsolete => 1, + length => 4 }, use_tls => { context => [qw(list)], @@ -3495,8 +3463,6 @@ our %pinfo = ( }, use_ssl => { context => [qw(list)], - #order => 2.5, - #gettext_id => 'use SSL (LDAPS)', #format => ['yes', 'no'], #default => 'no' obsolete => 'use_tls', @@ -3856,12 +3822,10 @@ our %pinfo = ( occurrence => '1' }, port => { - context => [qw(list)], - order => 2.1, - gettext_id => "remote port", - format => '\d+', - obsolete => 1, - length => 4 + context => [qw(list)], + format => '\d+', + obsolete => 1, + length => 4 }, use_tls => { context => [qw(list)], @@ -3875,8 +3839,6 @@ our %pinfo = ( }, use_ssl => { context => [qw(list)], - #order => 2.5, - #gettext_id => 'use SSL (LDAPS)', #format => ['yes', 'no'], #default => 'no' obsolete => 'use_tls', @@ -4037,12 +3999,10 @@ our %pinfo = ( occurrence => '1' }, port => { - context => [qw(list)], - order => 2.1, - gettext_id => "remote port", - format => '\d+', - obsolete => 1, - length => 4 + context => [qw(list)], + format => '\d+', + obsolete => 1, + length => 4 }, use_tls => { context => [qw(list)], @@ -4056,8 +4016,6 @@ our %pinfo = ( }, use_ssl => { context => [qw(list)], - #order => 2.5, - #gettext_id => 'use SSL (LDAPS)', #format => ['yes', 'no'], #default => 'no' obsolete => 'use_tls', @@ -4923,12 +4881,11 @@ our %pinfo = ( ### Miscelaneous (list) account => { - context => [qw(list)], - group => 'other', - gettext_id => "Account", - format => '\S+', - length => 10, - obsolete => 1, # Maybe never implemented + context => [qw(list)], + group => 'other', + format => '\S+', + length => 10, + obsolete => 1, # Maybe never implemented }, clean_delay_queuemod => { @@ -4950,11 +4907,6 @@ our %pinfo = ( order => 90.02, group => 'other', sample => '123456789', - gettext_id => 'Secret string for generating unique keys', - #gettext_comment => - # 'This parameter is a confidential item for generating authentication keys for administrative commands (ADD, DELETE, etc.). This parameter should remain concealed, even for owners. The cookie is applied to all list owners, and is only taken into account when the owner has the auth parameter.', - gettext_comment => - "This allows generated authentication keys to differ from a site to another. It is also used for encryption of user passwords stored in the database. The presence of this string is one reason why access to \"sympa.conf\" needs to be restricted to the \"sympa\" user.\nNote that changing this parameter will break all HTTP cookies stored in users' browsers, as well as all user passwords and lists X509 private keys. To prevent a catastrophe, Sympa refuses to start if this \"cookie\" parameter was changed.", format => '\S+', field_type => 'password', length => 15, @@ -5043,12 +4995,9 @@ our %pinfo = ( }, expire_task => { - context => [qw(list)], - order => 90.05, - group => 'other', - gettext_id => "Periodical subscription expiration task", - gettext_comment => - "This parameter states which model is used to create an expire task. An expire task regularly checks the subscription or resubscription date of subscribers and asks them to renew their subscription. If they don't they are deleted.", + context => [qw(list)], + order => 90.05, + group => 'other', task => 'expire', obsolete => 1, }, @@ -5114,12 +5063,10 @@ our %pinfo = ( occurrence => '0-1' }, date => { - context => [qw(list)], - #order => 2, - gettext_id => 'date', - format => '.+', - obsolete => 1, - not_after => '6.2.16', + context => [qw(list)], + format => '.+', + obsolete => 1, + not_after => '6.2.16', }, date_epoch => { context => [qw(list)], @@ -5148,12 +5095,10 @@ our %pinfo = ( occurrence => '1' }, date => { - context => [qw(list)], - #order => 2, - gettext_id => "human readable", - format => '.+', - obsolete => 1, - not_after => '6.2.16', + context => [qw(list)], + format => '.+', + obsolete => 1, + not_after => '6.2.16', }, date_epoch => { context => [qw(list)], @@ -5184,13 +5129,11 @@ our %pinfo = ( length => 30 }, date => { - context => [qw(list)], - #order => 2, - gettext_id => 'date', - format => '.+', - length => 30, - obsolete => 1, - not_after => '6.2.16', + context => [qw(list)], + format => '.+', + length => 30, + obsolete => 1, + not_after => '6.2.16', }, date_epoch => { context => [qw(list)], @@ -5319,12 +5262,9 @@ our %pinfo = ( }, use_fast_cgi => { - context => [qw(site)], - default => '1', - gettext_id => 'Enable FastCGI', - file => 'wwsympa.conf', - gettext_comment => - 'Is FastCGI module for HTTP server installed? This module provides a much faster web interface.', + context => [qw(site)], + default => '1', + file => 'wwsympa.conf', obsolete => 1, not_after => '6.2.22', }, @@ -5682,11 +5622,10 @@ our %pinfo = ( # HTML editor htmlarea_url => { - context => [qw(site)], - gettext_id => '', - file => 'wwsympa.conf', - obsolete => 1, - not_after => '6.2.35b.1', + context => [qw(site)], + file => 'wwsympa.conf', + obsolete => 1, + not_after => '6.2.35b.1', }, use_html_editor => { context => [qw(domain site)], @@ -5970,17 +5909,13 @@ our %pinfo = ( #FIXME: Probablly not available now. automatic_list_prefix => { - context => [qw(site)], - gettext_id => - 'Defines the prefix allowing to recognize that a list is an automatic list.', - obsolete => 1, # Maybe not used + context => [qw(site)], + obsolete => 1, # Maybe not used }, default_distribution_ttl => { - context => [qw(site)], - gettext_id => - 'Default timeout between two action-triggered synchronizations of list members with data sources.', + context => [qw(site)], default => '300', - obsolete => 1, # Maybe not used + obsolete => 1, # Maybe not used }, edit_list => { context => [qw(site)], @@ -6206,19 +6141,15 @@ our %user_info = ( internal => 1, }, included => { - #order => 12, obsolete => 1, - gettext_id => 'included', format => ['0', '1'], occurrence => '1', default => '0', internal => 1, }, id => { - #order => 13, - obsolete => 1, - gettext_id => 'name of external datasource', - internal => 1, + obsolete => 1, + internal => 1, }, date => { order => 14, @@ -6305,19 +6236,15 @@ our %user_info = ( internal => 1, }, included => { - #order => 12, obsolete => 1, - gettext_id => 'included', format => ['0', '1'], occurrence => '1', default => '0', internal => 1, }, id => { - #order => 13, - obsolete => 1, - gettext_id => 'name of external datasource', - internal => 1, + obsolete => 1, + internal => 1, }, date => { order => 14, From 0777ea1dbe4545e5a48a9c2a552f1e686b29468f Mon Sep 17 00:00:00 2001 From: IKEDA Soji Date: Sun, 4 Sep 2022 08:16:31 +0900 Subject: [PATCH 4/4] Improve description of a parameter a bit --- src/lib/Sympa/Config/Schema.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Sympa/Config/Schema.pm b/src/lib/Sympa/Config/Schema.pm index 21c8b91af..a5e541289 100644 --- a/src/lib/Sympa/Config/Schema.pm +++ b/src/lib/Sympa/Config/Schema.pm @@ -2404,9 +2404,9 @@ our %pinfo = ( order => 53.00_05, group => 'antispam', default => 'x-spam-status', - gettext_id => 'Name of header field to inform', + gettext_id => 'Type of spam filter', gettext_comment => - 'Messages are supposed to be filtered by an spam filter that adds them one or more headers. This parameter is used to select a special scenario in order to decide the message\'s spam status: ham, spam or unsure. This parameter replaces antispam_tag_header_name, antispam_tag_header_spam_regexp and antispam_tag_header_ham_regexp.', + 'Messages are supposed to be filtered by an spam filter that adds them one or more headers. This parameter is used to select a special scenario in order to decide the message\'s spam status: ham, spam or unsure.', scenario => 'spam_status', not_before => '6.1a.2', },