Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Sympa
Commits
c8b2df83
Commit
c8b2df83
authored
Apr 05, 2021
by
Sympa authors
Committed by
IKEDA Soji
Apr 05, 2021
Browse files
tidyall
parent
5ed4228d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/cgi/wwsympa.fcgi.in
View file @
c8b2df83
...
...
@@ -1178,7 +1178,8 @@ while ($query = Sympa::WWW::FastCGI->new) {
# Compat. < 6.2.32: "host" parameter was deprecated.
$param->{'conf'}{'host'} = Conf::get_robot_conf($robot, 'domain');
# Compat. < 6.2.62: Renamed parameters.
$param->{'conf'}{'use_blacklist'} = Conf::get_robot_conf($robot, 'use_blocklist');
$param->{'conf'}{'use_blacklist'} =
Conf::get_robot_conf($robot, 'use_blocklist');
foreach my $auth (keys %{$Conf::Conf{'cas_id'}{$robot}}) {
$log->syslog('debug2', 'CAS authentication service %s', $auth);
...
...
@@ -4089,9 +4090,13 @@ sub do_requestpasswd {
# Action confirmed?
my $next_action = $session->confirm_action(
$in{'action'}, $in{'response_action'},
$in{'action'},
$in{'response_action'},
arg => join(',', $email, $reason),
previous_action => ($in{'previous_action'} || ($reason ? 'firstpasswd' : 'renewpasswd'))
previous_action => (
$in{'previous_action'}
|| ($reason ? 'firstpasswd' : 'renewpasswd')
)
);
return $next_action unless $next_action eq '1';
...
...
src/lib/Conf.pm
View file @
c8b2df83
...
...
@@ -1693,7 +1693,9 @@ sub _load_config_file_to_hash {
# Deprecated syntax: `command`
if
(
$value
=~
/^\`(.*)\`$/
)
{
die
sprintf
"
%s: Backtick (`...`) in sympa.conf is no longer allowed. Check and modify configuration.
\n
",
$value
;
die
sprintf
"
%s: Backtick (`...`) in sympa.conf is no longer allowed. Check and modify configuration.
\n
",
$value
;
}
$keyword
=
...
...
src/lib/Sympa/Config/Schema.pm
View file @
c8b2df83
...
...
@@ -1145,21 +1145,19 @@ our %pinfo = (
gettext_id
=>
"
Message personalization
",
format
=>
{
web_apply_on
=>
{
context
=>
[
qw(list domain site)
],
order
=>
1
,
group
=>
'
sending
',
gettext_id
=>
'
Scope for messages from the web interface
',
context
=>
[
qw(list domain site)
],
order
=>
1
,
group
=>
'
sending
',
gettext_id
=>
'
Scope for messages from the web interface
',
format
=>
['
none
',
'
footer
',
'
all
'],
default
=>
'
footer
',
occurrence
=>
'
1
'
},
mail_apply_on
=>
{
context
=>
[
qw(list domain site)
],
order
=>
2
,
group
=>
'
sending
',
gettext_id
=>
'
Scope for messsages from incoming email
',
context
=>
[
qw(list domain site)
],
order
=>
2
,
group
=>
'
sending
',
gettext_id
=>
'
Scope for messsages from incoming email
',
format
=>
['
none
',
'
footer
',
'
all
'],
default
=>
'
none
',
occurrence
=>
'
1
'
...
...
@@ -4806,12 +4804,13 @@ our %pinfo = (
# WWSympa: Basic configuration
wwsympa_url
=>
{
context
=>
[
qw(domain site)
],
order
=>
110.01
,
group
=>
'
www_basic
',
sample
=>
'
https://web.example.org/sympa
',
gettext_id
=>
'
URL prefix of web interface
',
gettext_comment
=>
'
This is used to construct URLs of web interface. The protocol (either https:// or http://) is required.
',
context
=>
[
qw(domain site)
],
order
=>
110.01
,
group
=>
'
www_basic
',
sample
=>
'
https://web.example.org/sympa
',
gettext_id
=>
'
URL prefix of web interface
',
gettext_comment
=>
'
This is used to construct URLs of web interface. The protocol (either https:// or http://) is required.
',
},
wwsympa_url_local
=>
{
context
=>
[
qw(domain site)
],
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment