Skip to content

GitLab

Unverified Commit 06cd0ab0 authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge branch 'sympa-6.2' into foundation6

parents 46054829 35600198
Hide whitespace changes
Inline Side-by-side
.travis.yml
View file @ 06cd0ab0
......@@ -32,6 +32,7 @@ install:
- cpanm --notest --quiet CGI::Fast FCGI
- cpanm --notest --quiet Unicode::CaseFold
- cpanm --notest --quiet SOAP::Lite Net::LDAP
- cpanm --installdeps . --with-develop
before_script:
- coverage-setup
......@@ -40,6 +41,7 @@ script:
- autoreconf -i
- ./configure
- cd src; make; cd ..
- make check-local TEST_FILES='xt/perltidy.t' || true
- make check-local TEST_FILES='t/compile_executables.t t/compile_modules.t t/Language.t t/parse_templates.t t/pod-syntax.t'
after_success:
......
Makefile.am
View file @ 06cd0ab0
......@@ -58,11 +58,13 @@ noinst_SCRIPTS = \
xt/fixme.t \
xt/fixme-todo.t \
xt/pod-coverage.t \
xt/pod-spelling.t
xt/pod-spelling.t \
xt/perltidy.t
EXTRA_DIST = \
AUTHORS.md \
CONTRIBUTING.md \
cpanfile \
INSTALL.md \
NEWS.md \
OChangeLog \
......
cpanfile 0 → 100644
View file @ 06cd0ab0
on 'develop' => sub {
requires 'Test::Fixme';
requires 'Test::PerlTidy';
requires 'Perl::Tidy', '== 20180220';
};
default/Makefile.am
View file @ 06cd0ab0
......@@ -65,8 +65,17 @@ nobase_default_DATA = \
global_task_models/purge_spools.daily.task \
global_task_models/purge_tables.daily.task \
global_task_models/purge_user_table.monthly.task \
list_task_models/expire.2month.task \
list_task_models/expire.3month.task \
list_task_models/expire.4month.task \
list_task_models/expire.6month.task \
list_task_models/expire.9month.task \
list_task_models/expire.yearly.task \
list_task_models/remind.2month.task \
list_task_models/remind.3month.task \
list_task_models/remind.4month.task \
list_task_models/remind.6month.task \
list_task_models/remind.9month.task \
list_task_models/remind.monthly.task \
list_task_models/remind.yearly.task \
list_task_models/sync_include.ttl.task \
......
default/mail_tt2/automatic_bounce_management.tt2
View file @ 06cd0ab0
......@@ -13,4 +13,6 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]List %1 automatic bounce managem
[% user %]
[% END %]
[% IF conf.wwsympa_url -%]
[%|loc%]Managing bouncing subscribers:[%END%] [% 'reviewbouncing' | url_abs([list.name]) %]
[% END -%]
default/mail_tt2/command_report.tt2
View file @ 06cd0ab0
......@@ -126,4 +126,6 @@ X-Loop: [% conf.email %]@[% domain %]
-----------==========================================-----------
[% IF conf.wwsympa_url -%]
[%|loc(conf.wwsympa_url)%]For further information, check the mailing list web site %1[%END%]
[% END -%]
default/mail_tt2/expire_warning1.tt2
View file @ 06cd0ab0
......@@ -2,12 +2,16 @@
Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
[%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
[% | mailtourl({subject => "sub ${list.name}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[%|loc%]Everything about this list: [%END%][% 'info' | url_abs([list.name]) %]
[%|loc%]Unsubscription:[%END%]
[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% IF conf.wwsympa_url -%]
[%|loc%]Everything about this list: [%END ~%]
[% 'info' | url_abs([list.name]) %]
[%|loc%]Unsubscription:[%END%] [%""~%]
[% 'signoff' | url_abs([list.name]) %]
[% ELSE -%]
[%|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 -%]
default/mail_tt2/expire_warning2.tt2
View file @ 06cd0ab0
......@@ -3,12 +3,16 @@ From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
[%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
[% | mailtourl({subject => "sub ${list.name}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[%|loc%]Everything about this list: [%END%][% 'info' | url_abs([list.name]) %]
[%|loc%]Unsubscription:[%END%]
[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% IF conf.wwsympa_url -%]
[%|loc%]Everything about this list: [%END ~%]
[% 'info' | url_abs([list.name]) %]
[%|loc%]Unsubscription:[%END%] [%""~%]
[% 'signoff' | url_abs([list.name]) %]
[% ELSE -%]
[%|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 -%]
default/mail_tt2/invite.tt2
View file @ 06cd0ab0
......@@ -6,15 +6,13 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Invitation to join list %1[%END%
[%|loc(list.subject)%]This list is about %1, so you are probably concerned.[%END%]
[%|loc%]To subscribe, click the following URL:[%END%]
[% IF user_interfaces.size() == 1 && user_interfaces.0 == 'mail' -%]
[% | mailtourl({subject => "AUTH ${keyauth} ${cmd}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[% IF conf.wwsympa_url -%]
[% 'auth' | url_abs([keyauth,'subscribe',list.name],{email=>user.email}) %]
[%~ ELSE -%]
[% "${conf.email}@${domain}" | mailtourl({subject => "AUTH ${keyauth} ${cmd}"}) %]
[%|loc(conf.email,domain)%]Or send a message to %1@%2 with the following subject:[%END%]
AUTH [% keyauth %] [% cmd %]
[%- ELSE -%]
[% 'auth' | url_abs([keyauth,'subscribe'],{email=>user.email}) %]
[%- END %]
[%~ END -%]
[%|loc%]If you don't want to subscribe just ignore this message.[%END%]
default/mail_tt2/list_created.tt2
View file @ 06cd0ab0
......@@ -3,8 +3,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]%1 mailing list creation[%END%][
[%|loc(list.name,domain)%]%1@%2 mailing list has been activated by listmaster.[%END%]
[% IF conf.wwsympa_url -%]
[%|loc%]homepage[%END%]
[% 'info' | url_abs([list.name]) %]
[%|loc(list.name)%]%1 admin page[%END%]
[% 'admin' | url_abs([list.name]) %]
[% END -%]
default/mail_tt2/reject.tt2
View file @ 06cd0ab0
......@@ -6,6 +6,7 @@ Subject: [% FILTER qencode %][%|loc%]Your message has been rejected[%END%][%END%
[%|loc(subject)%](Subject of your mail: %1)[%END%]
[% IF conf.wwsympa_url -%]
[%|loc(list.name)%]Check %1 list usage:[%END%]
[% 'info' | url_abs([list.name]) %]
[% END -%]
default/mail_tt2/remind.tt2
View file @ 06cd0ab0
......@@ -6,10 +6,14 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Reminder of your subscription to
[%|loc%]It is important to us to not send mail to people that don't want to receive it. If you do not want to be on this mailing list, please follow the instructions below to remove yourself.[%END%]
[%|loc%]List information: [%END%][% 'info' | url_abs([list.name]) %]
[% IF subscriber.included != 1 %]
[%|loc%]To unsubscribe:[%END%]
[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%]
[% conf.email %]@[% domain %]
[%~ END %]
[%END%]
[% IF conf.wwsympa_url -%]
[%|loc%]List information: [%END ~%]
[% 'info' | url_abs([list.name]) %]
[%|loc%]To unsubscribe:[%END%] [%""~%]
[% 'signoff' | url_abs([list.name]) %]
[% ELSE -%]
[%|loc%]List information: [%END ~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
[%|loc%]To unsubscribe:[%END%] [%""~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
[% END -%]
default/mail_tt2/request_auth.tt2
View file @ 06cd0ab0
......@@ -33,7 +33,7 @@ Subject: [% FILTER qencode %]AUTH [%keyauth%] [%cmd%][%END%]
[%- END -%]
[% IF user_interfaces.size() == 1 and user_interfaces.0 == 'mail' -%]
[% IF not conf.wwsympa_url -%]
[% sympa = BLOCK %][% conf.email %]@[% domain %][%END -%]
[%|loc(sympa,"AUTH ${keyauth} ${cmd}") %]If you want this action to be taken, please
......
default/mail_tt2/user_notification.tt2
View file @ 06cd0ab0
......@@ -31,8 +31,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Management of list %1[%END%][%EN
[%|loc(delegator,list.name,domain)%]You have been delegated the responsability of list moderator by %1 for list %2@%3.[%END%]
[% END %]
[% IF conf.wwsympa_url -%]
[%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %]
[%|loc%]Owner and moderator guide:[%END%] [% 'help/admin' | url_abs %]
[% END -%]
[% ELSIF type == 'ticket_to_family_signoff' -%]
Subject: [% FILTER qencode %][%|loc(family)%]Unsubscribing from family %1[%END%][%END%]
......
default/mail_tt2/welcome.tt2
View file @ 06cd0ab0
......@@ -10,6 +10,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Welcome to list %1[%END%][%END%]
[% CATCH %]
[% END %]
[% IF conf.wwsympa_url -%]
[%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %]
[%|loc%]General informations about mailing lists:[%END%] [% 'help/introduction' | url_abs %]
[% END -%]
default/mail_tt2/x509-user-cert-missing.tt2
View file @ 06cd0ab0
......@@ -8,5 +8,7 @@ Subject: %2[%END%]
[%|loc(user.email)%]It was not possible to send you the message because the mailing list manager was unable to access your personal certificate (email %1).[%END%]
[%|loc(conf.email,domain)%]Please, in order to receive future encrypted messages send a signed message to %1@%2.[%END%]
[% IF conf.wwsympa_url -%]
[%|loc%]Information about this list:[%END%]
[% 'info' | url_abs([list.name]) %]
[% END -%]
default/scenari/send.confidential
View file @ 06cd0ab0
title.gettext restricted to subscribers
title.gettext restricted to subscribers, messages from others are discarded
is_subscriber([listname],[sender]) smtp,dkim,smime,md5 -> do_it
is_editor([listname],[sender]) smtp,dkim,smime,md5 -> do_it
......
default/web_tt2/help_sendmsg.tt2
View file @ 06cd0ab0
......@@ -33,7 +33,7 @@
<h5>[%|helploc%]Privacy[%END%]</h5>
<p>[%|helploc%]All messages sent to the list are kept in the list archive. <strong>Thus, the simple fact of sending a message constitutes an express authorization of distribution and reproduction in the archive</strong>. However, you can request the deletion of any message you sent, whether directly from the list archive ('Tag this mail for deletion' button) or by <a href="faquser#contactadmin">contacting the list owners</a>.[%END%]</p>
<p>[%|helploc%]If you send a message to the list, <strong>your email address will naturally display in your message header and in the list archive</strong>. However, unless otherwise specified, your email address and the other data you provided when you subscribed will not be disclosed to any other third party without your agreement.[%END%]</p>
<p class="retraitita">[%|helploc%]In most countries, your personal data is protected through a number of laws. For example, in the United States, the Privacy Act of 1974 applies. In the European Union, the "Directive 95/46/EC of the European Parliament and of the Council of 24 October 1995 on the protection of individuals with regard to the processing of personal data and on the free movement of such data" and national laws arising from it apply. To know more about this, <a href="faquser#contactadmin">please contact the list owners</a>.[%END%]</p>
<p class="retraitita">[%|helploc%]In most countries, your personal data is protected through a number of laws. For example, in the United States, the Privacy Act of 1974 applies. In the European Union, the "Regulation (EU) 2016/679 of the European Parliament and of the Council of 27 April 2016 on the protection of natural persons with regard to the processing of personal data and on the free movement of such data" and national laws arising from it apply. To know more about this, <a href="faquser#contactadmin">please contact the list owners</a>.[%END%]</p>
<p>[%|helploc%]As for any correspondence, <strong>you must sign your messages</strong>. On professional mailing lists, <strong>it is customary to mention the name of the organization you belong to and your job title alongside your name</strong>. However, <strong>ask yourself whether it is relevant to give your complete details</strong> (address, telephone number, etc.): they will remain available at any time in the list archive...[%END%]</p>
<p>[%|helploc%]<strong>Do never send information about other people without their express agreement</strong>.[%END%]</p>
......
default/web_tt2/modindex.tt2
View file @ 06cd0ab0
......@@ -7,29 +7,6 @@
method="POST">
<fieldset class="toggleContainer" data-toggle-selector="input[name='id']">
<input type="hidden" name="list" value="[% list %]" form="moderate_mails" />
<p>
<input class="MainMenuLinks" type="submit" form="moderate_mails" name="action_distribute" value="[%|loc%]Distribute[%END%]" />
</p>
<p>
<input class="MainMenuLinks" type="submit" form="moderate_mails" name="action_reject" value="[%|loc%]Reject[%END%]" />
<select name="message_template" form="moderate_mails">
<option value="reject_quiet"
[%~ IF msg.value.spam_status == 'spam' %] selected="selected"[% END ~%]
>[%|loc %]No notification[%END%]</option>
<option value="reject">[%|loc %]Server default rejection message[%END%]</option>
[% FOREACH file = available_files %]
<option value="reject_[% file %]"
[%~ IF file == default_reject_template %] selected="selected"[%END ~%]
> [% file %]</option>
[%- END- %]
</select>
</p>
<p>
<input type=checkbox name="blacklist" form="moderate_mails" /> [%|loc %]Add to blacklist[%END%]
</p>
<h3>[%|loc%]Listing messages to moderate[%END%]</h3>
<div class="row">
<div class="small-2 medium-1 columns">
<a href="#" data-tooltip aria-haspopup="true"
......@@ -57,7 +34,7 @@
<div class="row">
<div class="small-2 medium-1 columns">
<input type="checkbox" name="id" value="[% msg.key %]"
form="moderate_mails" />
form="moderate_mails" />&nbsp;&nbsp;
[%~# Button to load AJAX content into reveal modal with Foundation ~%]
<a href="[% 'ajax/viewmod' | url_rel([list,msg.key]) %]"
......@@ -104,12 +81,35 @@
[% msg.value.size %] [%|loc%]Kbytes[%END%]
</div>
</div>
[% END %]
[% END %]
<h3>[%|loc%]Bulk moderation[%END%]</h3>
<p>
<input class="MainMenuLinks toggleButton" type="button"
value="[%|loc%]Toggle Selection[%END%]" form="moderate_mails" />
</p>
<p>
<input class="MainMenuLinks" type="submit" form="moderate_mails" name="action_distribute" value="[%|loc%]Distribute selected emails[%END%]" />
</p>
<p>
<input class="MainMenuLinks" type="submit" form="moderate_mails" name="action_reject" value="[%|loc%]Reject selected emails[%END%]" />
<input type="hidden" name="from_modindex" value="from_modindex" form="moderate_mails" />
<select name="message_template" form="moderate_mails">
<option value="reject_quiet"[%- IF msg.value.spam_status == 'spam' -%] [% one_template_is_selected = '1' %]selected="selected"[% END %]>[%|loc %]No notification[%END%]</option>
<option value="reject">[%|loc %]Server default rejection message[%END%]</option>
[% FOREACH file = available_files %]
<option value="reject_[% file %]" [% IF file == default_reject_template %] selected="selected" [%END%] > [% file %]</option>
[%- END- %]
</select>
<br />
</p>
<p>
[% IF conf.reporting_spam_script_path %]
<input type=checkbox name="signal_spam" form="moderate_mails"/> [%|loc %]Report messages as undetected spam[%END%]</label>
<br />
[% END %]
<input type=checkbox name="blacklist" form="moderate_mails" /> [%|loc %]Add to blacklist[%END%]
</p>
</fieldset>
</form>
......@@ -120,6 +120,8 @@
</p>
[%~ END %]
<hr>
<h2>[%|loc%]Moderation management[%END%] <a href="[% 'nomenu/help/admin' | url_rel %]#moderate" title="[%|loc%]Open in a new window[%END%]" onclick="window.open('','wws_help','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=400,height=200')" target="wws_help"><i class="fa fa-question-circle" title="[%|loc%]Help[%END%]"></i></a></h2>
<form class="noborder" action="[% path_cgi %]" method="post" name="moderation_management">
......
default/web_tt2/serveradmin.tt2
View file @ 06cd0ab0
......@@ -16,10 +16,45 @@
[% IF subaction == 'vhosts' %]
<h2>[%|loc%]Virtual Robots[%END%]</h2> <br />
[% IF robots %]
[%|loc%]The following virtual robots are running on this server:[%END%]
<ul>
[% FOREACH vr = robots %]<li><a href="[% vr.value.wwsympa_url %]/serveradmin">[% vr.key %]</a> - <i>[%|loc%]Sympa URL:[%END%]</i> <b>[% vr.value.wwsympa_url %]</b> - <i>[%|loc%]Mail domain:[%END%]</i> <b>[% vr.key %]</b> - <i>[%|loc%]Listmaster(s):[%END%]</i> <b>[% FOREACH admin = vr.value.listmaster %][% admin %] [% END %]</b></li>[% END %]
</ul>
<p>
[%|loc%]The following virtual robots are running on this server:[%END%]
</p>
[% FOREACH vr = robots %]
<h4>
[% IF vr.value.wwsympa_url ~%]
<a href="[% vr.value.wwsympa_url %]/serveradmin">
[% vr.value.title || vr.key %]
</a>
[%~ ELSE ~%]
[% vr.value.title || vr.key %]
[%~ END %]
</h4>
<ul>
<li>
<i>[%|loc%]Mail domain:[%END%]</i>
<b>[% vr.key %]</b>
</li>
[% IF vr.value.wwsympa_url ~%]
<li>
<i>[%|loc%]Sympa URL:[%END%]</i>
<b>[% vr.value.wwsympa_url %]</b>
</li>
[%~ END %]
<li>
<i>[%|loc%]Listmaster(s):[%END%]</i>
[% FOREACH admin = vr.value.listmasters ~%]
[% UNLESS loop.first ~%]
[% UNLESS loop.last ~%]
[%|loc%], [%END%]
[%~ ELSE ~%]
[%|loc%], and [%END%]
[%~ END %]
[%~ END ~%]
<b>[% admin %]</b>
[%~ END %]
</li>
</ul>
[% END %]
[% ELSE %]
<p>[%|loc%]No Virtual Robot defined on this server[%END%]</p>
[% END %]
......
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