Commit 0b5d7d93 authored by Sympa authors's avatar Sympa authors Committed by IKEDA Soji
Browse files

tidyall.

parent 4dacc825
...@@ -281,7 +281,7 @@ sub _twist { ...@@ -281,7 +281,7 @@ sub _twist {
$return_path = Sympa::get_address($robot, 'owner'); $return_path = Sympa::get_address($robot, 'owner');
} }
if ($new_message->{shelved}{merge} if ( $new_message->{shelved}{merge}
and $new_message->{shelved}{merge} ne 'footer') { and $new_message->{shelved}{merge} ne 'footer') {
unless ($new_message->personalize($list, $rcpt)) { unless ($new_message->personalize($list, $rcpt)) {
$log->syslog('err', 'Erreur d appel personalize()'); $log->syslog('err', 'Erreur d appel personalize()');
...@@ -293,7 +293,8 @@ sub _twist { ...@@ -293,7 +293,8 @@ sub _twist {
delete $new_message->{shelved}{merge}; delete $new_message->{shelved}{merge};
} }
if ($new_message->{shelved}{decorate}) { if ($new_message->{shelved}{decorate}) {
$new_message->decorate($list, $rcpt, mode => $new_message->{shelved}{merge}); $new_message->decorate($list, $rcpt,
mode => $new_message->{shelved}{merge});
delete $new_message->{shelved}{decorate}; delete $new_message->{shelved}{decorate};
} }
......
...@@ -322,8 +322,11 @@ sub authenticateAndRun { ...@@ -322,8 +322,11 @@ sub authenticateAndRun {
my $session = my $session =
Sympa::WWW::Session->new($ENV{'SYMPA_ROBOT'}, {cookie => $cookie}); Sympa::WWW::Session->new($ENV{'SYMPA_ROBOT'}, {cookie => $cookie});
unless (defined $session && ! $session->{'new_session'} && $session->{'email'} eq $email) { unless (defined $session
$log->syslog('err', 'Failed to authenticate user %s with session ID %s', && !$session->{'new_session'}
&& $session->{'email'} eq $email) {
$log->syslog('err',
'Failed to authenticate user %s with session ID %s',
$email, $cookie); $email, $cookie);
die SOAP::Fault->faultcode('Client') die SOAP::Fault->faultcode('Client')
->faultstring('Could not get email from cookie')->faultdetail(''); ->faultstring('Could not get email from cookie')->faultdetail('');
......
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