Unverified Commit 1fb977bf authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge branch 'sympa-6.2' into email_address_format

parents d2f4fc21 75ebdbd5
......@@ -6,3 +6,25 @@ about: Ask community for help
<!--- ↑↑ Provide a general summary of the issue in the Title above ↑↑ -->
Version
-------
<!-- Versions of Sympa and related software -->
Installation method
-------------------
<!-- How you installed Sympa: deb, rpm, ports, ... or source package -->
Expected behavior
-----------------
<!--- Tell us what should happen -->
Actual behavior
---------------
<!--- Tell us what happens instead of the expected behavior -->
Additional information
----------------------
<!--- You may also attach files using "selecting them" link below. -->
<!--- NOTE that you should not include sensitive information! -->
......@@ -8,7 +8,6 @@
- coverage-install
- coverage-setup
- cpanm --quiet --notest --installdeps --with-develop --with-feature=Data::Password --with-feature=ldap --with-feature=safe-unicode --with-feature=smime --with-feature=soap --with-feature=sqlite .
- cpanm --notest --quiet Unicode::CaseFold
- autoreconf -i
- ./configure
- cd src; make; cd ..
......@@ -17,12 +16,6 @@
- coverage-report
- make clean
"5.10":
<<: *job
"5.12":
<<: *job
"5.14":
<<: *job
"5.16":
<<: *job
variables:
......
......@@ -11,9 +11,6 @@ perl:
- "5.20"
- "5.18"
- "5.16"
- "5.14"
- "5.12"
- "5.10"
matrix:
include:
......@@ -29,7 +26,6 @@ before_install:
install:
- cpan-install --coverage
- cpanm --installdeps --notest --with-develop --with-feature=Data::Password --with-feature=ldap --with-feature=safe-unicode --with-feature=smime --with-feature=soap --with-feature=sqlite .
- cpanm --notest --quiet Unicode::CaseFold
before_script:
- coverage-setup
......
# Change Log
## [6.2.65b.1](https://github.com/sympa-community/sympa/tree/6.2.65b.1) (2021-07-30)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.64...6.2.65b.1)
**Implemented enhancements:**
- Improving data source synchronization performance [\#1186](https://github.com/sympa-community/sympa/issues/1186).
**Fixed bugs:**
- `custom_attribute` parameters are not transferred when subscribe action wasn't forwarded to the owner [\#1199](https://github.com/sympa-community/sympa/issues/1199).
- Drop dependency Socket6 [\#1211](https://github.com/sympa-community/sympa/issues/1211).
- WWSympa: Update jQuery to 3.6.0 [\#1204](https://github.com/sympa-community/sympa/issues/1204).
- `custom_robot_parameter` parameter was broken [\#1207](https://github.com/sympa-community/sympa/pull/1207).
- Typos in `mhonarc_rc.tt2` (formerly `mhonarc-ressources.tt2`) [\#1206](https://github.com/sympa-community/sympa/pull/1206).
**Merged pull requests:**
- Refactor internals of config (2) [\#1214](https://github.com/sympa-community/sympa/pull/1214).
## [6.2.64](https://github.com/sympa-community/sympa/tree/6.2.64) (2021-06-30)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.63b.2...6.2.64)
**Merged pull requests:**
- Some more changes to \#1174 [\#1202](https://github.com/sympa-community/sympa/pull/1202)
**Closed issues:**
- Excessive memory usage after upgrading to Sympa 6.2.62 [\#1170](https://github.com/sympa-community/sympa/issues/1170)
## [6.2.63b.2](https://github.com/sympa-community/sympa/tree/6.2.63b.2) (2021-06-21)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.63b.1...6.2.63b.2)
**Implemented enhancements:**
- Add `create_list.closed` scenario. [\#1191](https://github.com/sympa-community/sympa/pull/1191)
- Make `distribution_ttl` and `inclusion_notification_feature` site-wide [\#1183](https://github.com/sympa-community/sympa/pull/1183)
**Fixed bugs:**
- S/MIME: Extracting certificate with multiple email values fails [\#1196](https://github.com/sympa-community/sympa/issues/1196)
- Noises in HTTP server error log [\#1185](https://github.com/sympa-community/sympa/issues/1185)
- `delete_list_member()` failed removing subscribers' pictures [\#1189](https://github.com/sympa-community/sympa/pull/1189)
## [6.2.63b.1](https://github.com/sympa-community/sympa/tree/6.2.63b.1) (2021-05-31)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.62...6.2.63b.1)
**Implemented enhancements:**
- Hide archive download link from users without proper permissions [\#1176](https://github.com/sympa-community/sympa/pull/1176) [\#1179](https://github.com/sympa-community/sympa/pull/1179)
- Obsolete `escape_chars()` / `unescape_chars()` [\#1167](https://github.com/sympa-community/sympa/pull/1167)
- Use web URL in instruction if web interface is available [\#1159](https://github.com/sympa-community/sympa/pull/1159)
- Add list visibility scenario for logged in users. [\#1140](https://github.com/sympa-community/sympa/pull/1140)
- Add ability to forbid some list names [\#672](https://github.com/sympa-community/sympa/issues/672)
**Fixed bugs:**
- `bulk.pl` don't deliver mails if failed to personalize [\#1174](https://github.com/sympa-community/sympa/issues/1174)
- Newlines in header fields added by ARC feature should be normalized [\#1168](https://github.com/sympa-community/sympa/issues/1168)
- Error emails to listmaster from repeated `set_netidtoemail_db` calls [\#1163](https://github.com/sympa-community/sympa/issues/1163)
- Sympa should not lock out users using password authentication with LDAP [\#1132](https://github.com/sympa-community/sympa/issues/1132)
- `mailto:` link cannot be detected by some MUAs [\#1124](https://github.com/sympa-community/sympa/issues/1124)
- Comments in HTTP Accept-Language field should be omitted [\#1152](https://github.com/sympa-community/sympa/pull/1152)
- Empty paragraph in list config should not be warned. [\#1150](https://github.com/sympa-community/sympa/pull/1150)
**Closed issues:**
- Support scripts for maintenance [\#538](https://github.com/sympa-community/sympa/issues/538)
## [6.2.62](https://github.com/sympa-community/sympa/tree/6.2.62) (2021-04-27)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.61b.2...6.2.62)
**Incompatible changes** (since 6.2.60)**:**
- `cookie` parameter in `sympa.conf` was obsoleted [\#1091](https://github.com/sympa-community/sympa/issues/1091). For more details read [Security Advisory 2021-001](https://sympa-community.github.io/security/2021-001.md).
- By a request from the user with English background, the term "blacklist" was replaced with "blocklist". By this change, names of some parameters and configuration file were changed [\#1111](https://github.com/sympa-community/sympa/issues/1111) [\#1144](https://github.com/sympa-community/sympa/issues/1144). This change will be migrated automatically during upgrading process.
- MHonArc resource template `mhonarc-ressources.tt2` was renamed to `mhonarc_rc.tt2` and format of tags in it was changed. Existing customizations will be migrated automatically during upgrading process [\#1095](https://github.com/sympa-community/sympa/pull/1095).
- Remove undocumented backtick syntax in `sympa.conf` [\#1086](https://github.com/sympa-community/sympa/issues/1086). If `sympa.conf` includes the parameter values enclosed in backticks (`` ` ``...`` ` ``), any programs of Sympa will abort.
- Drop support for Perl prior to 5.16 [\#1030](https://github.com/sympa-community/sympa/issues/1030).
**Fixed bugs:**
- [CVE-2020-26880] root privilege escalation from user sympa by modifying sympa.conf [\#1009](https://github.com/sympa-community/sympa/issues/1009).
- xgettext.pl: Templates shouldn't be processed as Perl source [\#1143](https://github.com/sympa-community/sympa/pull/1143) [\#1149](https://github.com/sympa-community/sympa/pull/1149).
## [6.2.61b.2](https://github.com/sympa-community/sympa/tree/6.2.61b.2) (2021-04-05)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.61b.1...6.2.61b.2)
**Implemented enhancements:**
- Refactoring: Add `shelve_personalization` method [\#1070](https://github.com/sympa-community/sympa/issues/1070)
- Scenarios: Skip approval for owner subscription and unsubscription [\#1133](https://github.com/sympa-community/sympa/pull/1133)
**Fixed bugs:**
- DMARC protection: X-Original-DMARC-Record header field may break message [\#1113](https://github.com/sympa-community/sympa/issues/1113)
- Slow updates to lists (`edit_list_conf` cache not working) [\#1090](https://github.com/sympa-community/sympa/issues/1090)
## [6.2.61b.1](https://github.com/sympa-community/sympa/tree/6.2.62) (2021-02-18)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.60...6.2.61b.1)
**Incompatible changes:**
- By a request from the user with English background, the term "blacklist" was replaced with "blocklist". By this change, names of some parameters and configuration file were changed [\#1111](https://github.com/sympa-community/sympa/issues/1111). This change will be migrated automatically during upgrading process.
- MHonArc resource template `mhonarc-ressources.tt2` was renamed to `mhonarc_rc.tt2` and format of tags in it was changed. Existing customizations will be migrated during upgrading process [\#1095](https://github.com/sympa-community/sympa/pull/1095).
- Remove undocumented backtick syntax in `sympa.conf` [\#1086](https://github.com/sympa-community/sympa/issues/1086).
- Drop support for Perl prior to 5.16 [\#1030](https://github.com/sympa-community/sympa/issues/1030).
**Implemented enhancements:**
- Replace 'blacklist' with 'blocklist' [\#1111].
- WWSympa: Make it clear that wwsympa_url needs to include the protocol [\#1115](https://github.com/sympa-community/sympa/pull/1115).
- WWSympa: Add autocomplete="off" to all forms unless explicitly enabled [\#1114](https://github.com/sympa-community/sympa/pull/1114).
- sympa.pl: Fix and speed up `--make_alias_file` command [\#1046](https://github.com/sympa-community/sympa/pull/1046).
- Skip execution of `aliases_program` in newaliases script if value is "`none`" [\#1061](https://github.com/sympa-community/sympa/issues/1061).
- WWSympa: Avoid nuisance messages using `renewpasswd` page [\#1076](https://github.com/sympa-community/sympa/issues/1076).
- Improve labels for personalization control [\#1060](https://github.com/sympa-community/sympa/issues/1060).
**Fixed bugs:**
- Protect web archive against spam harvesters: "only show gecos" doesn't seem to work [\#1107](https://github.com/sympa-community/sympa/issues/1107)
- Default configuration breaks web GUI post [\#1104](https://github.com/sympa-community/sympa/issues/1104).
- bulk.pl daemon crashes if it failed to load private key [\#1110](https://github.com/sympa-community/sympa/issues/1110).
- Upgrade process may fail `searchkey_list` value overflowing that column size [\#1053](https://github.com/sympa-community/sympa/pull/1053) [\#1106](https://github.com/sympa-community/sympa/pull/1106).
**Merged pull requests:**
- Fix code duplication for merge/personalization feature [\#1063](https://github.com/sympa-community/sympa/issues/1063).
## [6.2.60](https://github.com/sympa-community/sympa/tree/6.2.60) (2021-01-04)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.59b.1...6.2.60)
......
......@@ -25,7 +25,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.60)
AC_INIT(sympa, 6.2.60, sympa-developpers@listes.renater.fr)
AC_INIT(sympa, 6.2.65b.1, sympa-developpers@listes.renater.fr)
AM_INIT_AUTOMAKE([foreign -Wall -Werror 1.9 tar-pax])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_PO_SUBDIRS
......
......@@ -3,7 +3,7 @@
# Minimum version of Perl required.
# Notation suggested on https://metacpan.org/pod/Carton#PERL-VERSIONS
requires 'perl', '5.10.1';
requires 'perl', '5.16.0';
# This module provides zip/unzip for archive and shared document download/upload
requires 'Archive::Zip', '>= 1.05';
......@@ -208,9 +208,11 @@ feature 'x509-auth', 'Required to extract user certificates for SSL clients and
};
feature 'smime', 'Required to sign, verify, encrypt and decrypt S/MIME messages.' => sub {
requires 'Convert::ASN1';
requires 'Crypt::SMIME', '>= 0.15';
# Required to extract user certificates for SSL clients and S/MIME messages.
requires 'Crypt::OpenSSL::X509', '>= 1.800.1';
# Note: On versions < 1.808, the value() method for extension was broken.
requires 'Crypt::OpenSSL::X509', '>= 1.808';
};
feature 'csv', 'CSV database driver, required if you include list members, owners or moderators from CSV file.' => sub {
......@@ -269,9 +271,11 @@ feature 'Net::DNS', 'This is required if you set a value for "dmarc_protection_m
};
feature 'ipv6', 'Required to support IPv6 with client features.' => sub {
requires 'Socket6', '>= 0.23';
# Note: Perl 5.14 bundles Socket 0.95 which exports AF_INET6. Earlier
# version also requires Socket6 >= 0.23.
# Note: Some distributions e.g. RHEL/CentOS 6 do not provide package for
# IO::Socket::IP. If that is the case, use IO::Socket::INET6 instead.
# IO::Socket::IP. If that is the case, use IO::Socket::INET6 instead.
# Note: Perl 5.20.0 bundles IO::Socket::IP 0.29.
requires 'IO::Socket::IP', '>= 0.21';
};
......
......@@ -32,7 +32,7 @@ nobase_default_DATA = \
create_list.conf \
edit_list.conf \
ldap_alias_entry.tt2 \
mhonarc-ressources.tt2 \
mhonarc_rc.tt2 \
mime.types \
nrcpt_by_domain.conf \
sympa.wsdl \
......@@ -187,7 +187,7 @@ nobase_default_DATA = \
web_tt2/arcsearch.tt2 \
web_tt2/arc.tt2 \
web_tt2/aside_menu.tt2 \
web_tt2/blacklist.tt2 \
web_tt2/blocklist.tt2 \
web_tt2/button_footer.tt2 \
web_tt2/button_header.tt2 \
web_tt2/ca.tt2 \
......
[%# certif_warning.tt2 ~%]
Subject: [%"near expiration of your certificate"|loc|qencode%]
[%|loc(expiration_date)%]Your authentication certificate will expire on %1.[%END%]
......@@ -8,6 +9,6 @@ Subject: [%"near expiration of your certificate"|loc|qencode%]
[%|loc(conf.email,domain)%]To receive them again, renew your certificate with your certification authority
and send a signed message to %1@%2
or
click: [%END%][% | mailtourl({subject => 'WHICH'}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
click: [%END%][% "${conf.email}@${domain}" | mailtourl({subject => 'WHICH'}) %]
[%# end certif_warning.tt2 ~%]
......@@ -116,13 +116,15 @@ You are not allowed to send this message for the following reason:[%END%]
[% ELSE -%]
[%|loc%]The following address is not a known mailing list:[%END%]
[% recipient %]
[% recipient %]
[%|loc%]To find out the correct list name, ask for this server's lists directory:[%END%]
[% | mailtourl({subject => 'WHICH'}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% IF conf.wwsympa_url -%]
[% 'my' | url_abs %]
[%- ELSE -%]
[% "${conf.email}@${domain}" | mailtourl({subject => 'WHICH'}) %]
[%- END %]
[%|loc(conf.listmaster_email,domain)%]For further information, please contact %1@%2[%END%]
......@@ -158,3 +160,5 @@ X-Sympa-Attach: yes
[% END -%]
--[% boundary %]--
[%# end delivery_status_notification.tt2 ~%]
[%# expire_deletion.tt2 ~%]
From: [% fromlist %]
Subject: [%"Removed from %1"|loc(list.name)|qencode%]
......@@ -6,6 +7,10 @@ Subject: [%"Removed from %1"|loc(list.name)|qencode%]
because you didn't confirm your subscription.[%END%]
[%|loc%]You can subscribe again:[%END%]
[% | mailtourl({subject => "sub ${list.name}"}) ~%]
[%conf.email%]@[%domain%]
[%~ END %]
[% IF conf.wwsympa_url -%]
[% 'subscribe' | url_abs([list.name]) %]
[%- ELSE -%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[%- END %]
[%# end expire_deletion.tt2 ~%]
......@@ -2,16 +2,20 @@
Subject: [%"resubscription to %1"|loc(list.name)|qencode%]
[%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[% IF conf.wwsympa_url -%]
[% 'subscribe' | url_abs([list.name]) %]
[%|loc%]Everything about this list: [%END ~%]
[% 'info' | url_abs([list.name]) %]
[%|loc%]Unsubscription:[%END%] [%""~%]
[% 'signoff' | url_abs([list.name]) %]
[% 'signoff' | url_abs([list.name],{email => user.email}) %]
[% ELSE -%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[%|loc%]Information about this list: [%END ~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
[%|loc%]Unsubscription:[%END%] [%""~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
[% END -%]
[%# end expire_warning1.tt2 ~%]
......@@ -3,16 +3,20 @@ From: [% fromlist %]
Subject: [%"resubscription to %1"|loc(list.name)|qencode%]
[%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[% IF conf.wwsympa_url -%]
[% 'subscribe' | url_abs([list.name]) %]
[%|loc%]Everything about this list: [%END ~%]
[% 'info' | url_abs([list.name]) %]
[%|loc%]Unsubscription:[%END%] [%""~%]
[% 'signoff' | url_abs([list.name]) %]
[% 'signoff' | url_abs([list.name],{email => user.email}) %]
[% ELSE -%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[%|loc%]Information about this list: [%END ~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
[%|loc%]Unsubscription:[%END%] [%""~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
[% END -%]
[%# end expire_warning2.tt2 ~%]
[%# global_remind.tt2 ~%]
Subject: [%"Subscription summary"|loc|qencode%]
X-Sympa-NoWrap: yes
......@@ -10,8 +11,12 @@ X-Sympa-NoWrap: yes
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
[% FOREACH l = lists -%]
[% l %] [% | mailtourl({subject => "sig ${l} ${user.email}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% IF conf.wwsympa_url -%]
[% l %] [% 'signoff' | url_abs([l],{email => user.email}) %]
[%- ELSE -%]
[% l %] [% "${conf.email}@${domain}" | mailtourl({subject => "sig ${l} ${user.email}"}) %]
[%- END %]
[% END -%]
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
[%# end global_remind.tt2 ~%]
[%# list_unknown.tt2 ~%]
To: [% to %]
Subject: [%"List unknown"|loc|qencode%]
Content-Type: multipart/report; report-type=delivery-status;
......@@ -10,13 +11,15 @@ Content-Description: Notification
[%|loc%]The following address is not a known mailing list:[%END%]
[% list %]
[% list %]
[%|loc%]To find out the correct list name, ask for this server's lists directory:[%END%]
[% | mailtourl({subject => 'WHICH'}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% IF conf.wwsympa_url -%]
[% 'my' | url_abs %]
[%- ELSE -%]
[% "${conf.email}@${domain}" | mailtourl({subject => 'WHICH'}) %]
[%- END %]
[%|loc(conf.listmaster_email,domain)%]For further information, please contact %1@%2[%END%]
......@@ -38,3 +41,5 @@ Content-Type: text/rfc822-headers
[% header %]
--[% boundary %]--
[%# end list_unknown.tt2 ~%]
......@@ -142,3 +142,5 @@ Subject: [%"List %1 / %2"|loc(list.name,type)|qencode%]
[% param0 %]
[% END %]
[%# end listowner_notification.tt2 ~%]
......@@ -26,20 +26,18 @@ Content-Disposition: inline
[% ELSE -%]
[% IF method == 'md5' && ! request_topic -%]
[%|loc(list.name)%]To distribute the attached message in list %1:[%END%]
<[% | mailtourl({subject => "DISTRIBUTE ${list.name} ${modkey}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]>
[% "${conf.email}@${domain}" | mailtourl({subject => "DISTRIBUTE ${list.name} ${modkey}"}) %]
[%|loc(conf.email,domain)%]Or send a message to %1@%2 with the following subject:[%END%]
DISTRIBUTE [% list.name %] [% modkey %]
[%|loc%]To reject it (it will be removed):[%END%]
<[% | mailtourl({subject => "REJECT ${list.name} ${modkey}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]>
[% "${conf.email}@${domain}" | mailtourl({subject => "REJECT ${list.name} ${modkey}"}) %]
[%|loc(conf.email,domain)%]Or send a message to %1@%2 with the following subject:[%END%]
REJECT [% list.name %] [% modkey %]
[%END%]
[%|loc%]The messages moderating documentation:[%END%] <[% 'help' | url_abs(['admin-moderate.html']) %]>
[%|loc%]The messages moderating documentation:[%END%] [% 'help' | url_abs(['admin-moderate.html']) %]
[%- END%]
[%- END%]
[% IF spam_status != 'spam' -%]
......@@ -53,3 +51,5 @@ X-Sympa-Attach: yes
--[% boundary %]--
[%- END %]
[%# end moderate.tt2 ~%]
[%# removed.tt2 ~%]
From: [% fromlist %]
Subject: [%"Removed from %1"|loc(list.name)|qencode%]
[%|loc(user.email,list.name,domain)%]Your email address (%1) has been removed from list %2@%3[%END%]
[%|loc%]You can subscribe again:[%END%]
[% | mailtourl({subject => "sub ${list.name}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% IF conf.wwsympa_url -%]
[% 'subscribe' | url_abs([list.name]) %]
[%- ELSE -%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[%- END %]
[%# end removed.tt2 ~%]
......@@ -46,6 +46,9 @@
[%~ ELSIF report_entry == 'create_list_listmaster' ~%]
[%|loc()%]List creation is restricted to listmaster.[%END%]
[%~ ELSIF report_entry == 'create_list_closed' ~%]
[%|loc()%]List creation is not allowed.[%END%]
[%~ ELSIF report_entry == 'd_edit_subscriber' ~%]
[%|loc()%]Shared document edition is restricted to list subscribers.[%END%]
[%|loc()%]If you are subscribed to the list with a different email address, you should either use that other email address or update your list membership with the new email address.[%END%]
......@@ -632,6 +635,9 @@ Warning: this message may already have been sent by one of the list's moderators
[%~ ELSIF report_entry == 'missing_arg' ~%]
[%|loc(report_param.argument)%]Missing argument %1[%END%]
[%~ ELSIF report_entry == 'prohibited_listname' ~%]
[%|loc(report_param.argument)%]The name you want to use for your list (%1) is prohibited by the configuration of the server.[%END%]
[%~ ELSIF report_entry == 'missing_post_source' ~%]
[%|loc()%]You didn't define the web page you want to use to create your newsletter. Please specify either an URL or a file to upload.[%END%]
......@@ -651,8 +657,8 @@ Warning: this message may already have been sent by one of the list's moderators
[%~ ELSIF report_entry == 'incorrect_email' ~%]
[%|loc(report_param.email || report_param.value)%]Address "%1" is incorrect[%END%]
[%~ ELSIF report_entry == 'blacklisted_domain' ~%]
[%|loc(report_param.email || report_param.value)%]Address "%1" belongs to a blacklisted domain[%END%]
[%~ ELSIF report_entry == 'blocklisted_domain' ~%]
[%|loc(report_param.email || report_param.value)%]Address "%1" belongs to a blocklisted domain[%END%]
[%~ ELSIF report_entry == 'incorrect_passwd' ~%]
[%|loc%]Provided password is incorrect[%END%]
......
......@@ -17,9 +17,7 @@ Content-Disposition: inline
[% 'request_topic' | url_abs([list.name,authkey]) %]
[%- ELSE -%][%|loc(list.name)%]To distribute the attached message in list %1, click on the URL:[%END%]
[% | mailtourl({subject => "CONFIRM ${authkey}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% "${conf.email}@${domain}" | mailtourl({subject => "CONFIRM ${authkey}"}) %]
[%|loc(conf.email,domain)%]Or send a message to %1@%2 with the following subject:[% END %]
CONFIRM [% authkey %]
......@@ -34,3 +32,5 @@ X-Sympa-Attach: yes
[%# Message is attached here. #%]
--[% boundary %]--
[%# end send_auth.tt2 ~%]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment