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
...@@ -3327,11 +3327,11 @@ msgstr "" ...@@ -3327,11 +3327,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -3400,11 +3400,11 @@ msgstr "" ...@@ -3400,11 +3400,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -4313,14 +4313,15 @@ msgstr "" ...@@ -4313,14 +4313,15 @@ msgstr ""
"reguły mówią co innego." "reguły mówią co innego."
#: default/web_tt2/help_sendmsg.tt2:36 #: default/web_tt2/help_sendmsg.tt2:36
#, fuzzy
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
"W większości krajów Twoje dane są chronione przez prawo. Na przykład w " "W większości krajów Twoje dane są chronione przez prawo. Na przykład w "
"Stanach Zjednoczonych ma zastosowanie Akt Prywatności z 1974. W Unii " "Stanach Zjednoczonych ma zastosowanie Akt Prywatności z 1974. W Unii "
...@@ -6115,6 +6116,22 @@ msgstr "" ...@@ -6115,6 +6116,22 @@ msgstr ""
"<strong>standardowy (odbiór bezpośredni)</strong>: tryb domyślny, usuwa " "<strong>standardowy (odbiór bezpośredni)</strong>: tryb domyślny, usuwa "
"wszelkie inne ustawienia trybu odbierania." "wszelkie inne ustawienia trybu odbierania."
#~ msgid ""
#~ "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>."
#~ msgstr ""
#~ "W większości krajów Twoje dane są chronione przez prawo. Na przykład w "
#~ "Stanach Zjednoczonych ma zastosowanie Akt Prywatności z 1974. W Unii "
#~ "Europejskiej zastosowanie mają Dyrektywa 95/46/EC Parlamentu "
#~ "Europejskiego, a także prawo danego kraju. Aby dowiedzieć się więcej, <a "
#~ "href=\"faquser#contactadmin\">skontaktuj się z właścicielami listy</a>."
#~ msgid "" #~ msgid ""
#~ "a <a href=\"%1/help/introduction\">general introduction</a> to mailing " #~ "a <a href=\"%1/help/introduction\">general introduction</a> to mailing "
#~ "lists;" #~ "lists;"
......
...@@ -3319,11 +3319,11 @@ msgstr "" ...@@ -3319,11 +3319,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -3501,11 +3501,11 @@ msgstr "" ...@@ -3501,11 +3501,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -3321,11 +3321,11 @@ msgstr "" ...@@ -3321,11 +3321,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -3351,11 +3351,11 @@ msgstr "" ...@@ -3351,11 +3351,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -3324,11 +3324,11 @@ msgstr "" ...@@ -3324,11 +3324,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -3316,11 +3316,11 @@ msgstr "" ...@@ -3316,11 +3316,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -3305,11 +3305,11 @@ msgstr "" ...@@ -3305,11 +3305,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -2285,7 +2285,7 @@ msgid "If you send a message to the list, <strong>your email address will natura ...@@ -2285,7 +2285,7 @@ msgid "If you send a message to the list, <strong>your email address will natura
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:36 #: default/web_tt2/help_sendmsg.tt2:36
msgid "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>." msgid "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>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -3320,11 +3320,11 @@ msgstr "" ...@@ -3320,11 +3320,11 @@ msgstr ""
msgid "" msgid ""
"In most countries, your personal data is protected through a number of laws. " "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 " "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 " "European Union, the \"Regulation (EU) 2016/679 of the European Parliament "
"the Council of 24 October 1995 on the protection of individuals with regard " "and of the Council of 27 April 2016 on the protection of natural persons "
"to the processing of personal data and on the free movement of such data\" " "with regard to the processing of personal data and on the free movement of "
"and national laws arising from it apply. To know more about this, <a href=" "such data\" and national laws arising from it apply. To know more about "
"\"faquser#contactadmin\">please contact the list owners</a>." "this, <a href=\"faquser#contactadmin\">please contact the list owners</a>."
msgstr "" msgstr ""
#: default/web_tt2/help_sendmsg.tt2:37 #: default/web_tt2/help_sendmsg.tt2:37
......
...@@ -611,7 +611,7 @@ our %required_args = ( ...@@ -611,7 +611,7 @@ our %required_args = (
'reviewbouncing' => ['param.list'], 'reviewbouncing' => ['param.list'],
'rss_request' => [], 'rss_request' => [],
'savefile' => ['param.user.email', 'file'], 'savefile' => ['param.user.email', 'file'],
'search' => ['param.list', 'filter'], 'search' => ['param.list'],
'search_user' => ['param.user.email', 'email'], 'search_user' => ['param.user.email', 'email'],
'send_mail' => ['param.user.email'], 'send_mail' => ['param.user.email'],
'send_newsletter' => ['param.list', 'param.user.email', 'url'], 'send_newsletter' => ['param.list', 'param.user.email', 'url'],
...@@ -5098,11 +5098,15 @@ sub do_search { ...@@ -5098,11 +5098,15 @@ sub do_search {
$Conf::Conf{'db_additional_subscriber_fields'}; $Conf::Conf{'db_additional_subscriber_fields'};
## Access control ## Access control
return undef unless (defined check_authz('do_search', 'review')); return undef unless (defined check_authz('do_search', 'review'));
## Search key
$param->{'filter'} = $in{'filter'}; # Search key.
my $searchkey = undef; # GH #341: Keep search key in session store.
$searchkey = Sympa::Tools::Text::foldcase($param->{'filter'}) $param->{'filter'} = $in{'filter'} || $session->{'search__filter'};
my $searchkey = Sympa::Tools::Text::foldcase($param->{'filter'})
if defined $param->{'filter'} and length $param->{'filter'}; if defined $param->{'filter'} and length $param->{'filter'};
$session->{'search__filter'} = $param->{'filter'};
return 1 unless defined $searchkey;
   
my $record = 0; my $record = 0;
## Maximum size of selection ## Maximum size of selection
...@@ -16992,8 +16996,11 @@ sub get_server_details { ...@@ -16992,8 +16996,11 @@ sub get_server_details {
my $r = $_; my $r = $_;
( $r => { ( $r => {
(host => $r), # Compat.<6.2.32 (host => $r), # Compat.<6.2.32
( listmasters =>
[Sympa::get_listmasters_email($r)]
),
map { ($_ => Conf::get_robot_conf($r, $_)) } map { ($_ => Conf::get_robot_conf($r, $_)) }
qw(listmaster wwsympa_url) qw(listmaster title wwsympa_url)
} }
) )
} @robots } @robots
......
...@@ -1971,9 +1971,6 @@ sub _infer_robot_parameter_values { ...@@ -1971,9 +1971,6 @@ sub _infer_robot_parameter_values {
if not defined $param->{'config_hash'}{'domain'} if not defined $param->{'config_hash'}{'domain'}
and defined $param->{'config_hash'}{'host'}; and defined $param->{'config_hash'}{'host'};
$param->{'config_hash'}{'wwsympa_url'} ||= sprintf 'http://%s/sympa',
$param->{'config_hash'}{'domain'};
$param->{'config_hash'}{'static_content_url'} ||= $param->{'config_hash'}{'static_content_url'} ||=
$Conf{'static_content_url'}; $Conf{'static_content_url'};
$param->{'config_hash'}{'static_content_path'} ||= $param->{'config_hash'}{'static_content_path'} ||=
......
...@@ -501,7 +501,7 @@ sub html_store { ...@@ -501,7 +501,7 @@ sub html_store {
$yyyy, $yyyy,
$mm, $mm,
Conf::get_robot_conf($list->{'domain'}, 'arc_path'), Conf::get_robot_conf($list->{'domain'}, 'arc_path'),
Conf::get_robot_conf($list->{'domain'}, 'wwsympa_url'), (Conf::get_robot_conf($list->{'domain'}, 'wwsympa_url') || ''),
$tag $tag
), ),
'-umask' => $Conf::Conf{'umask'} '-umask' => $Conf::Conf{'umask'}
...@@ -669,7 +669,7 @@ sub html_rebuild { ...@@ -669,7 +669,7 @@ sub html_rebuild {
$yyyy, $yyyy,
$mm, $mm,
Conf::get_robot_conf($robot_id, 'arc_path'), Conf::get_robot_conf($robot_id, 'arc_path'),
Conf::get_robot_conf($robot_id, 'wwsympa_url'), (Conf::get_robot_conf($robot_id, 'wwsympa_url') || ''),
$tag $tag
), ),
'-umask' => $Conf::Conf{'umask'}, '-umask' => $Conf::Conf{'umask'},
......
...@@ -1249,10 +1249,11 @@ our @params = ( ...@@ -1249,10 +1249,11 @@ our @params = (
# Basic configuration # Basic configuration
{ 'name' => 'wwsympa_url', { 'name' => 'wwsympa_url',
'sample' => 'http://web.example.org/sympa', 'sample' => 'https://web.example.org/sympa',
'gettext_id' => 'URL prefix of web interface', 'gettext_id' => 'URL prefix of web interface',
'vhost' => '1', 'vhost' => '1',
'file' => 'sympa.conf', 'file' => 'sympa.conf',
'optional' => '1',
'edit' => '1', 'edit' => '1',
'gettext_comment' => 'gettext_comment' =>
'This is used to construct URLs of web interface.', 'This is used to construct URLs of web interface.',
......
...@@ -50,7 +50,7 @@ sub recursive_transformation { ...@@ -50,7 +50,7 @@ sub recursive_transformation {
} }
} }
} elsif (ref($var) eq 'HASH') { } elsif (ref($var) eq 'HASH') {
foreach my $key (sort keys %{$var}) { foreach my $key (keys %{$var}) {
if (ref($var->{$key})) { if (ref($var->{$key})) {
recursive_transformation($var->{$key}, $subref); recursive_transformation($var->{$key}, $subref);
} else { } else {
......
...@@ -1831,6 +1831,34 @@ sub upgrade { ...@@ -1831,6 +1831,34 @@ sub upgrade {
} }
} }
# GH #330: wwsympa_url would be optional. http://domain/sympa is
# assigned to robot.conf for compatibility.
if (lower_version($previous_version, '6.2.33b.2')) {
my @robot_ids = Sympa::List::get_robots();
foreach my $robot_id (@robot_ids) {
next if $robot_id eq $Conf::Conf{'domain'}; # Primary domain
my $config_file =
sprintf '%s/%s/robot.conf', $Conf::Conf{'etc'}, $robot_id;
my $ifh;
next unless open $ifh, '<', $config_file;
my ($parameter) = grep {/\Awwsympa_url\s+\S+/} <$ifh>;
close $ifh;
next if $parameter;
$log->syslog('info', 'Updating wwsympa_url for %s', $robot_id);
my $ofh;
unless (open $ofh, '>>', $config_file) {
$log->syslog('err', 'Cannot write to %s: %m', $config_file);
next;
}
printf $ofh "\n\n# Added by upgrade from %s\n", $previous_version;
printf $ofh "wwsympa_url\thttp://%s/sympa\n", $robot_id;
close $ofh;
}
}
return 1; return 1;
} }
......
use strict;
use warnings;
use Test::PerlTidy;
use FindBin qw($Bin);
run_tests(
path => "$Bin/../src/",
perltidyrc => "$Bin/../doc/dot.perltidyrc"
);
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