Commit c8cfd0d5 authored by david.verdin's avatar david.verdin
Browse files

[svn] retrienving latest modifications from 6.1 branch

git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@7233 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent b9935e98
...@@ -54,7 +54,7 @@ if test "$fhs" = "yes"; then ...@@ -54,7 +54,7 @@ if test "$fhs" = "yes"; then
mailtemplatedir=$defaultdir/mail_tt2 mailtemplatedir=$defaultdir/mail_tt2
webtemplatedir=$defaultdir/web_tt2 webtemplatedir=$defaultdir/web_tt2
execcgidir=$libdir/sympa/cgi execcgidir=$libdir/sympa/cgi
expldir=$localstatedir/lib/sympa expldir=$localstatedir/lib/sympa/list_data
staticdir=$localstatedir/lib/sympa/static_content staticdir=$localstatedir/lib/sympa/static_content
spooldir=$localstatedir/spool/sympa spooldir=$localstatedir/spool/sympa
arcdir=$localstatedir/lib/sympa/arc arcdir=$localstatedir/lib/sympa/arc
......
...@@ -3,10 +3,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Summary of list %1[%END%][%END%] ...@@ -3,10 +3,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Summary of list %1[%END%][%END%]
[% table_of_content %][%|loc%]:[%END%] [% table_of_content %][%|loc%]:[%END%]
[%|wrap(0,4)%][% FOREACH m = msg_list -%] [% FOREACH m = msg_list -%]
[% m.id %]. [% m.subject %] [% m.from %] [%|wrap(0,4)%][% m.id %]. [% m.subject %] [% m.from %][%END#wrap%]
[% IF conf.wwsympa_url %] [% IF conf.wwsympa_url %]
[% conf.wwsympa_url %]/arcsearch_id/[% list.name %]/[% m.month %]/[% m.message_id %] [% conf.wwsympa_url %]/arcsearch_id/[% list.name %]/[% m.month %]/[% m.message_id %]
[% END %] [% END %]
[% END %][%END#wrap%] [% END %]
...@@ -1530,11 +1530,12 @@ sub new { ...@@ -1530,11 +1530,12 @@ sub new {
## Only process the list if the name is valid. ## Only process the list if the name is valid.
my $listname_regexp = &tools::get_regexp('listname'); my $listname_regexp = &tools::get_regexp('listname');
unless ($name and ($name =~ /^$listname_regexp$/io) ) { unless ($name and ($name =~ /^($listname_regexp)$/io) ) {
&Log::do_log('err', 'Incorrect listname "%s"', $name) unless ($options->{'just_try'}); &Log::do_log('err', 'Incorrect listname "%s"', $name) unless ($options->{'just_try'});
return undef; return undef;
} }
## Lowercase the list name. ## Lowercase the list name.
$name = $1;
$name =~ tr/A-Z/a-z/; $name =~ tr/A-Z/a-z/;
## Reject listnames with reserved list suffixes ## Reject listnames with reserved list suffixes
...@@ -8882,8 +8883,8 @@ sub _save_stats_file { ...@@ -8882,8 +8883,8 @@ sub _save_stats_file {
} }
&Log::do_log('debug2', 'List::_save_stats_file(%s, %d, %d, %d)', $file, $total,$last_sync,$last_sync_admin_user ); &Log::do_log('debug2', 'List::_save_stats_file(%s, %d, %d, %d)', $file, $total,$last_sync,$last_sync_admin_user );
my $untainted_filename = sprintf ("%s",$file);
open(L, "> $file") || return undef; open(L, "> $untainted_filename") || return undef;
printf L "%d %.0f %.0f %.0f %d %d %d\n", @{$stats}, $total, $last_sync, $last_sync_admin_user; printf L "%d %.0f %.0f %.0f %d %d %d\n", @{$stats}, $total, $last_sync, $last_sync_admin_user;
close(L); close(L);
} }
......
...@@ -250,7 +250,8 @@ sub _lock_file { ...@@ -250,7 +250,8 @@ sub _lock_file {
## Read access to prevent "Bad file number" error on Solaris ## Read access to prevent "Bad file number" error on Solaris
my $fh; my $fh;
unless (open $fh, $open_mode.$lock_file) { my $untainted_lock_mode = sprintf("%s%s",$open_mode,$lock_file);
unless (open $fh, $untainted_lock_mode) {
&Log::do_log('err', 'Cannot open %s: %s', $lock_file, $!); &Log::do_log('err', 'Cannot open %s: %s', $lock_file, $!);
return undef; return undef;
} }
......
...@@ -531,7 +531,7 @@ sub check_cpan { ...@@ -531,7 +531,7 @@ sub check_cpan {
required_version =>'5.008', required_version =>'5.008',
}, },
'SOAP::Lite' => { 'SOAP::Lite' => {
required_version =>'0.712.5', required_version =>'0.712',
package_name => 'SOAP-Lite', package_name => 'SOAP-Lite',
usage => 'required if you want to run the Sympa SOAP server that provides ML services via a "web service"', usage => 'required if you want to run the Sympa SOAP server that provides ML services via a "web service"',
}, },
......
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