Commit fbfefa70 authored by sikeda's avatar sikeda
Browse files

[svn] Retrieving recent modifications from sympa-6.1-branch (#3 / 5).


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10133 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 3b0c6dd7
......@@ -49,7 +49,7 @@ installconfig: installdir
if [ ! -d $(DESTDIR)$(confdir) ]; then \
$(INSTALL) -d -m 755 $(DESTDIR)$(confdir); \
fi; \
$(AM_V_GEN)$(SED) \
$(SED) \
-e 's|--PERL--|$(PERL)|' \
-e 's|--modulesdir--|$(top_srcdir)/src/lib|' \
< $(top_srcdir)/src/sympa_wizard.pl.in > \
......
......@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.60)
AC_INIT(sympa, 6.2a.32, sympa-authors@cru.fr)
AC_INIT(sympa, 6.2a.32, sympa-authors@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
......
......@@ -118,7 +118,16 @@ you subscribed from a different e-mail address ?[%END-%]
Your configuration regarding this command has not been updated.[%END-%]
[% ELSIF u_err.entry == 'available_reception_mode' -%]
[%|loc(u_err.listname,u_err.modes)%]List %1 allows only these reception modes: %2[%END%]
[%|loc(u_err.listname)%]List %1 allows only these reception modes: [%END -%]
[%- FOREACH m = u_err.reception_modes -%]
[%- IF loop.size >= 2 && loop.count == loop.size -%]
[%|loc%], and [%END%][%|optdesc('reception',1)%][% m %][%END-%]
[%- ELSIF loop.count > 1 -%]
[%|loc%], [%END%][%|optdesc('reception',1)%][% m %][%END-%]
[%- ELSE -%]
[%|optdesc('reception',1)%][% m %][%END-%]
[%- END -%]
[%- END -%]
[% ELSIF u_err.entry == 'empty_archives' -%]
[%|loc()%]This list archive is empty.[%END%]
......
From: [% fromlist %]
To: [% to %]
Reply-to: [% replyto %]
Subject: [% FILTER qencode %][%|loc(list.name)%]Digest for list %1[%END%] [% IF total_group > 1 -%]([% current_group %]/[% total_group %])[% END %][%END%]
Subject: [% FILTER qencode %][%|loc(list.name,date)%]%1 Digest %2[%END%][% IF total_group > 1 %][%|loc(current_group,total_group)%] (%1/%2)[%END%][% END %][%END%]
Content-Type: multipart/mixed; boundary="[% boundary1 %]"
--[% boundary1 %]
Content-Disposition: inline
[%|loc(list.name,date)%]%1 Digest %2[%END%]
[%|loc%]Table of contents:[%END%]
[%|wrap(0,4)%][% FOREACH m = msg_list -%]
......@@ -28,14 +30,12 @@ X-Sympa-Attach: yes
[% m.full_msg %]
[% END %]
--[% boundary2 %]
Content-Disposition: inline
[%|loc(list.name,date)%]End of digest for list %1 - %2[%END%]
--[% boundary2 %]--
--[% boundary1 %]--
--[% boundary1 %]
Content-Disposition: inline
[%|loc(list.name,date)%]End of %1 Digest %2[%END%]
--[% boundary1 %]--
From: [% fromlist %]
To: [% to %]
Reply-to: [% replyto %]
Subject: [% FILTER qencode %][%|loc(list.name,date)%]%1 Digest %2[%END%] [% IF total_group > 1 -%]([% current_group %]/[% total_group %])[% END %][%END%]
Subject: [% FILTER qencode %][%|loc(list.name,date)%]%1 Digest %2[%END%][% IF total_group > 1 %][%|loc(current_group,total_group)%] (%1/%2)[%END%][% END %][%END%]
X-Sympa-NoWrap: yes
[%|loc(list.name,date)%]%1 Digest %2[%END%]
[%|loc%]Table of contents:[%END%]
[%|wrap(0,4)%][% FOREACH m = msg_list -%]
[% m.id %]. [% m.subject %] - [% m.from %]
[%|wrap(0,2)%][% FOREACH m = msg_list -%]
* [% m.id %] - [% m.subject %] - [% m.from %]
[% END %][%END#wrap%]
----------------------------------------------------------------------
[% FOREACH m = msg_list -%]
[%|wrap(0,4)%]Date: [% m.date %]
[%|wrap(0,1)%]Message-ID: <[% m.id %]>
Date: [% m.date %]
From: [% m.from %]
Subject: [% m.subject %][%END#wrap%]
[% m.plain_body %]
------------------------------
[% END %]
[%|loc(list.name,date)%]End of %1 Digest %2[%END%]
*********************************************
[%|loc(list.name,date)%]End of %1 Digest %2[%END%]
......@@ -5,25 +5,34 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]INFO %1[%END%][%END%]
[%|wrap(0,20)%][%|loc(list.subject)%]Subject : %1[%END%]
[% FOREACH o = owner -%]
[% IF o.visibility != 'conceal' %]
[% IF o.visibility != 'conceal' -%]
[%|loc(o.gecos)%]Owner : %1[%END%] <[% o.email %]>
[% END %]
[% END %]
[% END -%]
[%- END -%]
[% FOREACH e = editor -%]
[% IF o.visibility != 'conceal' %]
[% IF o.visibility != 'conceal' -%]
[%|loc(e.gecos)%]Moderator : %1[%END%] <[% e.email %]>
[% END %]
[% END %]
[% END -%]
[%- END -%]
[%|loc(subscribe)%]Subscription : %1[%END%]
[%|loc(unsubscribe)%]Unsubscription : %1[%END%]
[%|loc(send)%]Sending messages : %1[%END%]
[%|loc(review)%]Review subscribers: %1[%END%]
[%|loc(reply_to_header.value)%]Reply to : %1[%END%]
[%|loc('')%]Reply to : %1[%END%][%|optdesc%][% reply_to_header.value %][%END%][% IF reply_to_header.value == 'other_email' || reply_to_header.value == 'all' %] ([% reply_to_header.other_email %])[% END %]
[%|loc(max_size)%]Maximum size : %1[%END%]
[% IF digest -%]
[%|loc(digest)%]Digest : %1[%END%]
[% END %]
[%|loc(available_reception_mode)%]Receiving modes : %1[%END%]
[% END -%]
[%|loc('')%]Receiving modes : %1[%END-%]
[%- FOREACH m = available_reception_modeA -%]
[%- IF loop.size >= 2 && loop.count == loop.size -%]
[%|loc%], and [%END%][%|optdesc('reception',1)%][% m %][%END-%]
[%- ELSIF loop.count > 1 -%]
[%|loc%], [%END%][%|optdesc('reception',1)%][% m %][%END-%]
[%- ELSE -%]
[%|optdesc('reception',1)%][% m %][%END-%]
[%- END -%]
[%- END %]
[%|loc(url)%]Homepage : %1[%END%][%END#wrap%]
[% TRY %]
......
......@@ -67,6 +67,12 @@ Subject: [% FILTER qencode %][%|loc%]Database structure updated[%END%][%END%]
[% report_item %]
[% END %]
[% ELSIF type == 'css_updated' -%]
Subject: [% FILTER qencode %][%|loc%]CSS files have been updated[%END%][%END%]
[%|loc%]Static CSS files have been updated. Check log file for details.[%END%]
[% ELSIF type == 'db_restored' -%]
Subject: [% FILTER qencode %][%|loc%]DataBase connection restored[%END%][%END%]
......@@ -298,6 +304,15 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server erro
[%|loc%]See logs for more details.[%END%]
[% ELSIF type == 'automatic_list_creation_failed' -%]
Subject: [% FILTER qencode %][%|loc%]Listmaster: internal server error [%END%][%END%]
[% IF listname -%]
[%|loc(listname,family,robot,msg_id)%]Failed to process message. Unable to create the dynamic list %1 on family %2@%3. Message <%4> was ignored.[%END%]
[%- ELSE -%]
[%|loc(family,robot,msg_id)%]Failed to process message: family %1@%2 does not exist. Unable to create the dynamic list. Message <%3> was ignored.[%END%]
[%- END -%]
[%# INTERNAL SERVER ERROR : WEB -%]
[% ELSIF type == 'web_intern_error' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server error [%END%][%END%]
......
......@@ -4,7 +4,7 @@ Subject: [% FILTER qencode %][%subject%][%END%]
[%|loc(list.name,list.host)%]Here are the subscribers of %1@%2 mailing list:[%END%]
[%|wrap(0,4)%][% FOREACH u = users -%]
[% u.email %] - [% u.gecos %] - [% u.reception %]
[% u.email %] - [% u.gecos %] - [%|optdesc('reception')%][% u.reception %][% END %]
[% END %][%END#wrap%]
[%|loc(total)%]Total subscribers: %1[%END%]
......@@ -27,9 +27,9 @@ Deleted topic(s) is(are):[%END%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Management of list %1[%END%][%END%]
[% IF admin_type == 'owner' %]
[%|loc(delegator,list.name,list.host)%]You have been delegate the responsability of list owner by %1 for list %2@%3.[%END%]
[%|loc(delegator,list.name,list.host)%]You have been delegated the responsability of list owner by %1 for list %2@%3.[%END%]
[% ELSE %]
[%|loc(delegator,list.name,list.host)%]You have been delegate the responsability of list moderator by %1 for list %2@%3.[%END%]
[%|loc(delegator,list.name,list.host)%]You have been delegated the responsability of list moderator by %1 for list %2@%3.[%END%]
[% END %]
[%|loc%]The list homepage:[%END%] [% conf.wwsympa_url %]/info/[% list.name %]
......
......@@ -354,30 +354,30 @@ foreach my $file (@ordered_files) {
$state == BEGM && m/^([\(]) /gcx && do { $state = PARM; redo };
# begin or end of string
$state == PAR && m/^(\') /gcx && do { $state = QUO1; redo; };
$state == PAR && m/^\s*(\') /gcx && do { $state = QUO1; redo; };
$state == QUO1 && m/^([^\']+)/gcx && do { $str.=$1; redo; };
$state == QUO1 && m/^\' /gcx && do { $state = PAR; redo; };
$state == PAR && m/^\" /gcx && do { $state = QUO2; redo; };
$state == PAR && m/^\s*\" /gcx && do { $state = QUO2; redo; };
$state == QUO2 && m/^([^\"]+)/gcx && do { $str.=$1; redo; };
$state == QUO2 && m/^\" /gcx && do { $state = PAR; redo; };
$state == PAR && m/^\` /gcx && do { $state = QUO3; redo; };
$state == PAR && m/^\s*\` /gcx && do { $state = QUO3; redo; };
$state == QUO3 && m/^([^\`]*)/gcx && do { $str.=$1; redo; };
$state == QUO3 && m/^\` /gcx && do { $state = PAR; redo; };
$state == BEGM && m/^(\') /gcx && do { $state = QUOM1; redo; };
$state == PARM && m/^(\') /gcx && do { $state = QUOM1; redo; };
$state == PARM && m/^\s*(\') /gcx && do { $state = QUOM1; redo; };
$state == QUOM1 && m/^([^\']+)/gcx && do { $str.=$1; redo; };
$state == QUOM1 && m/^\' /gcx && do { $state = COMM; redo; };
$state == BEGM && m/^(\") /gcx && do { $state = QUOM2; redo; };
$state == PARM && m/^(\") /gcx && do { $state = QUOM2; redo; };
$state == PARM && m/^\s*(\") /gcx && do { $state = QUOM2; redo; };
$state == QUOM2 && m/^([^\"]+)/gcx && do { $str.=$1; redo; };
$state == QUOM2 && m/^\" /gcx && do { $state = COMM; redo; };
# end ()
($state == PAR && m/^[\)]/gcx || $state == COMM && m/^,/gcx)
($state == PAR && m/^\s*[\)]/gcx || $state == COMM && m/^,/gcx)
&& do {
$state = NUL;
$vars =~ s/[\n\r]//g if ($vars);
......
......@@ -61,7 +61,7 @@ if (($operation !~ /^(add|del)$/) || ($#ARGV < 2)) {
$default_domain = $Conf{'domain'};
my $alias_file;
$alias_file = $Conf{'sendmail_aliases'} || Sympa::Constants::SENDMAIL_ALIASES;
$alias_file = Conf::get_robot_conf($domain, 'sendmail_aliases') || Sympa::Constants::SENDMAIL_ALIASES;
$alias_file = $file if ($file);
unless (-w "$alias_file") {
......@@ -120,10 +120,14 @@ if ($operation eq 'add') {
## Newaliases
unless ($file) {
unless (system($alias_wrapper) == 0) {
print STDERR "Failed to execute newaliases: $!\n";
exit(6)
unless (system($alias_wrapper, "--domain=$domain") == 0) {
if ($? == -1) {
print STDERR "Failed to execute newaliases: $!\n";
} else {
printf STDERR "newaliases exited with status %d\n", ($? >> 8);
}
exit(6);
}
}
## Unlock
......@@ -191,9 +195,13 @@ if ($operation eq 'add') {
## Newaliases
unless ($file) {
unless (system($alias_wrapper) == 0) {
print STDERR "Failed to execute newaliases: $!\n";
exit (6);
unless (system($alias_wrapper, "--domain=$domain") == 0) {
if ($? == -1) {
print STDERR "Failed to execute newaliases: $!\n";
} else {
printf STDERR "newaliases exited with status %d\n", ($? >> 8);
}
exit(6);
}
}
## Unlock
......
......@@ -122,7 +122,7 @@ $options->{'stderr_to_tty'} = 1 if ($main::options{'foreground'});
$options->{'multiple_process'} = 0;
# Saves the pid number
&tools::write_pid($Conf::Conf{'pidfile_bulk'}, $$, $options);
tools::write_pid('bulk', $$, $options);
unless ($options->{'stderr_to_tty'}) {
&tools::direct_stderr_to_file(('pid' => $$));
}
......@@ -198,22 +198,22 @@ while (!$end) {
if ($#pids_leftover > -1) {
my @dc;
&Log::do_log('debug2','Some childs of current process disappeared. Checking whether they shut down cleanly or not.');
my $pids_in_pfile = &tools::get_pids_in_pid_file($Conf::Conf{'pidfile_bulk'});
my $pids_in_pfile = tools::get_pids_in_pid_file('bulk');
foreach my $fpid (@{$pids_in_pfile}) {
if (defined $dead_children{$fpid}) {
&Log::do_log('err','The %s child exists in the pid file but is no longer running. Removing it and notyfying listmaster.',$fpid);
my $pname = $0;
$pname =~ s/.*\/(\w+)/$1/;
&tools::send_crash_report(('pid'=>$fpid,'pname'=>$pname));
&tools::remove_pid($Conf::Conf{'pidfile_bulk'}, $fpid, $options);
tools::remove_pid('bulk', $fpid, $options);
delete $dead_children{$fpid};
push @dc, $fpid;
}
}
}
my $pids_in_pfile = &tools::get_pids_in_pid_file($Conf::Conf{'pidfile_bulk'});
my $pids_in_pfile = tools::get_pids_in_pid_file('bulk');
unless (defined($pids_in_pfile)){
&tools::write_pid($Conf::Conf{'pidfile_bulk'}, $$, $options);
tools::write_pid('bulk', $$, $options);
close STDERR;
&tools::direct_stderr_to_file(('pid' => $$));
$pids_in_pfile = [$$];
......@@ -233,7 +233,7 @@ while (!$end) {
if ((my $child_pid = fork) != 0) {
&Log::do_log('info', "Starting bulk child daemon, pid %s", $child_pid);
# Saves the pid number
&tools::write_pid($Conf::Conf{'pidfile_bulk'}, $child_pid, $options);
tools::write_pid('bulk', $child_pid, $options);
$created_children{$child_pid} = 1;
sleep 1;
}else{
......@@ -394,7 +394,7 @@ while (!$end) {
}
if($bulk->{'priority_packet'} == $Conf::Conf{'sympa_packet_priority'} + 5){
if($bulk->{'priority_packet'} == Conf::get_robot_conf($bulk->{'robot'}, 'sympa_packet_priority') + 5) {
&Log::do_log('notice','Done sending message "%s" (key "%s") to list "%s@%s" (priority %s) in %s seconds since scheduled expedition date.',
$bulk->{'messageid'},
$bulk->{'messagekey'},
......@@ -416,7 +416,7 @@ while (!$end) {
&List::send_notify_to_listmaster(undef, undef, undef, undef, 1); # Purge grouped notifications
&Log::do_log('notice', 'bulk.pl exited normally due to signal');
&tools::remove_pid($Conf::Conf{'pidfile_bulk'}, $$, $options);
tools::remove_pid('bulk', $$, $options);
exit(0);
......
<label for="template.[%template.key%]">[%|loc%]Confidential list setup[%END%]</label>
<ul>
<li>[%|loc%]No subscription / unsubscription: only the list owner can add members[%END%]</li>
<li>[%|loc%]private archives[%END%]</li>
<li>[%|loc%]list visible to list members only[%END%]</li>
<li>[%|loc%]Only list members can send messages. OTHER ARE SILENTLY REJECTED.[%END%]</li>
</ul></dd></dl>
subject [% subject %]
status [% status %]
[% IF topics -%]
topics [% topics %]
[% END %]
visibility conceal
send confidential
reject_mail_from_automates_feature on
web_archive
access private
archive
period month
access owner
clean_delay_queuemod 15
reply_to_header
value list
subscribe closed
unsubscribe closed
review private
invite closed
info conceal
custom_subject [% listname %]
digest 5 20:56
[% FOREACH o = owner -%]
owner
email [% o.email %]
profile privileged
[% IF o.gecos -%]
gecos [% o.gecos %]
[% END %]
[% END %]
[% IF editor -%]
[% FOREACH e = editor -%]
editor
email [% e.email %]
[% END %]
[% END %]
shared_doc
d_edit private
d_read private
pictures_feature on
creation
date [% creation.date %]
date_epoch [% creation.date_epoch %]
[% IF creation_email -%]
email [% creation_email %]
[% END %]
serial 0
[%|loc%]Public discussion mailing list[%END%]
<label for="template.[%template.key%]">[%|loc%]Public discussion mailing list[%END%]</label>
<ul><li>[%|loc%]public archives[%END%]</li>
<li>[%|loc%]only subscribers can post[%END%]</li>
</ul></dd></dl>
[%|loc%]Hotline mailing list[%END%]
<label for="template.[%template.key%]">[%|loc%]Hotline mailing list[%END%]</label>
<ul>
<li>[%|loc%]everyone can post[%END%]</li>
<li>[%|loc%]private archives[%END%]</li>
......
[%|loc%]Mailing list configuration to be used for a news letter providing both text plain and HTML formats[%END%]
<label for="template.[%template.key%]">[%|loc%]Mailing list configuration to be used for a news letter providing both text plain and HTML formats[%END%]</label>
<ul>
<li>[%|loc%]public and moderated list[%END%]</li>
<li>[%|loc%]subscribers emails are protected[%END%]</li>
......
[%|loc%]Mailing list for intranets[%END%]
<label for="template.[%template.key%]">[%|loc%]Mailing list for intranets[%END%]</label>
[%|loc%]Mailing list configuration to be used for a news letter[%END%]
<label for="template.[%template.key%]">[%|loc%]Mailing list configuration to be used for a news letter[%END%]</label>
<ul>
<li>[%|loc%]public and moderated list[%END%]</li>
<li>[%|loc%]subscribers emails are protected[%END%]</li>
......
[%|loc%]Private working group setup[%END%]
<label for="template.[%template.key%]">[%|loc%]Private working group setup[%END%]</label>
<ul>
<li>[%|loc%]only subscribers can post[%END%]</li>
<li>[%|loc%]private archives[%END%]</li>
......
Supports Markdown
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