Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

delete_list_member() failed removing subscribers' pictures #1189

Merged
merged 2 commits into from
Jun 16, 2021
Merged

delete_list_member() failed removing subscribers' pictures #1189

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2b8eb6
Bug: delete_list_member() failed removing subscribers' pictures
ikedas Jun 9, 2021
a0930a2
Some insignificant changes/corrections.
ikedas Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/lib/Sympa/List.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,7 @@ sub send_probe_to_user {
## $list->delete_list_member('users' => \@u, 'exclude' => 1)
## $list->delete_list_member('users' => [$email], 'exclude' => 1)
sub delete_list_member {
$log->syslog('debug2', '(%s, ...)', @_);
my $self = shift;
my %param = @_;
my @u = @{$param{'users'}};
Expand All @@ -1574,12 +1575,12 @@ sub delete_list_member {

$log->syslog('debug2', '');

my $name = $self->{'name'};
my $total = 0;

my $sdm = Sympa::DatabaseManager->instance;

foreach my $who (@u) {
next unless defined $who and length $who;
$who = Sympa::Tools::Text::canonic_email($who);

## Include in exclusion_table only if option is set.
Expand All @@ -1595,13 +1596,16 @@ sub delete_list_member {
q{DELETE FROM subscriber_table
WHERE user_subscriber = ? AND
list_subscriber = ? AND robot_subscriber = ?},
$who, $name, $self->{'domain'}
$who, $self->{'name'}, $self->{'domain'}
)
) {
$log->syslog('err', 'Unable to remove list member %s', $who);
next;
}

# Delete the pictures if any.
$self->delete_list_member_picture($who);

# Delete signoff requests if any.
my $spool_req = Sympa::Spool::Auth->new(
context => $self,
Expand All @@ -1620,7 +1624,7 @@ sub delete_list_member {
if ($operation) {
$log->add_stat(
'robot' => $self->{'domain'},
'list' => $name,
'list' => $self->{'name'},
'operation' => $operation,
'mail' => $who
);
Expand All @@ -1630,22 +1634,22 @@ sub delete_list_member {
}

$self->_cache_publish_expiry('member');
delete_list_member_picture($self, shift(@u));
return (-1 * $total);

}

## Delete the indicated admin users from the list.
sub delete_list_admin {
my ($self, $role, @u) = @_;
$log->syslog('debug2', '', $role);
$log->syslog('debug2', '(%s, %s, ...)', @_);
my $self = shift;
my $role = shift;
my @u = @_;

my $name = $self->{'name'};
my $total = 0;

foreach my $who (@u) {
next unless defined $who and length $who;
$who = Sympa::Tools::Text::canonic_email($who);
my $statement;

my $sdm = Sympa::DatabaseManager->instance;

Expand Down Expand Up @@ -3326,7 +3330,7 @@ sub add_list_member {
}
}

#Log in stat_table to make staistics
#Log in stat_table to make statistics
$log->add_stat(
'robot' => $self->{'domain'},
'list' => $self->{'name'},
Expand Down