Commit 7dcf8d40 authored by sikeda's avatar sikeda
Browse files

[-change] CONFIRM, DISTRIBUTE and REJECT no longer send separate error message...

[-change] CONFIRM, DISTRIBUTE and REJECT no longer send separate error message when held message was not found in spool.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@12582 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 7de3d32b
......@@ -145,6 +145,13 @@ Your configuration regarding this command has not been updated.[%END-%]
You probably confirmed your %1 using a different
email address. Please try using your canonical address.[%END-%]
[% ELSIF u_err.entry == 'unfound_message' -%]
[%|loc(u_err.listname,u_err.key)%]Unable to access the message on list %1 with key %2.
Warning: this message may already have been sent by one of the list's editor.[%END%]
[% ELSIF u_err.entry == 'unfound_file_message' -%]
[%|loc(u_err.key)%]Unable to access the message authenticated with key %1. The message may already been confirmed.[%END%]
[% ELSE %]
[% u_err.entry %]
[% END -%]
......
......@@ -2928,13 +2928,12 @@ sub distribute {
quiet => $quiet
);
unless ($spindle->spin) { # No message.
unless ($spindle and $spindle->spin) { # No message.
$log->syslog('err',
'Unable to find message with key <%s> for list %s',
$key, $list);
Sympa::Report::reject_report_msg('user', 'unfound_message', $sender,
{'listname' => $list->{'name'}, 'key' => $key},
$robot, '', $list);
Sympa::Report::reject_report_cmd('user', 'unfound_message',
{'listname' => $list->{'name'}, 'key' => $key}, $cmd_line);
return 'msg_not_found';
} elsif ($spindle->{finish} and $spindle->{finish} eq 'success') {
$log->syslog('info',
......@@ -2982,12 +2981,11 @@ sub confirm {
quiet => $quiet
);
unless ($spindle->spin) { # No message.
unless ($spindle and $spindle->spin) { # No message.
$log->syslog('info', 'CONFIRM %s from %s refused, auth failed',
$key, $sender);
Sympa::Report::reject_report_msg('user', 'unfound_file_message',
$sender, {'key' => $key},
$robot, '', '');
Sympa::Report::reject_report_cmd('user', 'unfound_file_message',
{'key' => $key}, $cmd_line);
return 'wrong_auth';
} elsif ($spindle->{finish} and $spindle->{finish} eq 'success') {
$log->syslog('info', 'CONFIRM %s from %s accepted (%.2f seconds)',
......@@ -3047,12 +3045,11 @@ sub reject {
quiet => $quiet
);
unless ($spindle->spin) { # No message
unless ($spindle and $spindle->spin) { # No message
$log->syslog('info', 'REJECT %s %s from %s refused, auth failed',
$which, $key, $sender);
Sympa::Report::reject_report_msg('user', 'unfound_message', $sender,
{'key' => $key},
$robot, '', $list);
$list->{'name'}, $key, $sender);
Sympa::Report::reject_report_cmd('user', 'unfound_message',
{'listname' => $list->{'name'}, 'key' => $key}, $cmd_line);
return 'wrong_auth';
} elsif ($spindle->{finish} and $spindle->{finish} eq 'success') {
$log->syslog('info', 'REJECT %s %s from %s accepted (%.2f seconds)',
......
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