Commit c1b5d157 authored by IKEDA Soji's avatar IKEDA Soji
Browse files

tidyall.

parent 746175a0
......@@ -14929,8 +14929,10 @@ sub do_send_mail {
if (@to_list and $in{'sub_action'} eq 'sendmailtolist') {
# TAG
if ($list_topics) {
Sympa::Spool::Topic->new(topic => $list_topics, method => 'sender')
->store($message);
Sympa::Spool::Topic->new(
topic => $list_topics,
method => 'sender'
)->store($message);
}
 
my $l_message = $message->dup;
......
......@@ -65,15 +65,20 @@ sub _twist {
if ($topic = Sympa::Spool::Topic->load($message)) {
# Is message already tagged?
;
} elsif ($topic = Sympa::Spool::Topic->load($message, in_reply_to => 1)) {
} elsif ($topic =
Sympa::Spool::Topic->load($message, in_reply_to => 1)) {
# Is message in-reply-to already tagged?
$topic =
Sympa::Spool::Topic->new(topic => $topic->{topic}, method => 'auto');
$topic = Sympa::Spool::Topic->new(
topic => $topic->{topic},
method => 'auto'
);
$topic->store($message);
} elsif (my $topic_list = $message->compute_topic) {
# Not already tagged.
$topic =
Sympa::Spool::Topic->new(topic => $topic_list, method => 'auto');
$topic = Sympa::Spool::Topic->new(
topic => $topic_list,
method => 'auto'
);
$topic->store($message);
}
......
......@@ -34,8 +34,8 @@ sub _twist {
my $self = shift;
my $message = shift;
return Sympa::Spool::Listmaster->instance->store($message, $message->{rcpt},
operation => $self->{data}{type}) ? 1 : undef;
return Sympa::Spool::Listmaster->instance->store($message,
$message->{rcpt}, operation => $self->{data}{type}) ? 1 : undef;
}
1;
......
......@@ -54,7 +54,9 @@ sub store {
my %options = @_;
my $mailer =
$self->{use_bulk} ? Sympa::Spool::Outgoing->new : Sympa::Mailer->instance;
$self->{use_bulk}
? Sympa::Spool::Outgoing->new
: Sympa::Mailer->instance;
my $operation = $options{operation};
my $robot_id;
......@@ -100,7 +102,9 @@ sub flush {
my %options = @_;
my $mailer =
$self->{use_bulk} ? Sympa::Spool::Outgoing->new : Sympa::Mailer->instance;
$self->{use_bulk}
? Sympa::Spool::Outgoing->new
: Sympa::Mailer->instance;
my $purge = $options{purge};
foreach my $robot_id (keys %{$self->{_stack}}) {
......
......@@ -157,7 +157,8 @@ sub authentication {
$log->syslog('notice',
'Password in database seems encrypted. Run upgrade_sympa_password.pl to rehash passwords'
);
Sympa::send_notify_to_listmaster('*', 'password_encrypted', {});
Sympa::send_notify_to_listmaster('*', 'password_encrypted',
{});
return undef;
}
......
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