summaryrefslogtreecommitdiff
path: root/rt/lib/RT/Shredder/Plugin
diff options
context:
space:
mode:
Diffstat (limited to 'rt/lib/RT/Shredder/Plugin')
-rw-r--r--rt/lib/RT/Shredder/Plugin/Attachments.pm2
-rw-r--r--rt/lib/RT/Shredder/Plugin/Base.pm9
-rw-r--r--rt/lib/RT/Shredder/Plugin/Summary.pm11
-rw-r--r--rt/lib/RT/Shredder/Plugin/Users.pm91
4 files changed, 76 insertions, 37 deletions
diff --git a/rt/lib/RT/Shredder/Plugin/Attachments.pm b/rt/lib/RT/Shredder/Plugin/Attachments.pm
index c33ffe83e..5a573ad27 100644
--- a/rt/lib/RT/Shredder/Plugin/Attachments.pm
+++ b/rt/lib/RT/Shredder/Plugin/Attachments.pm
@@ -132,7 +132,7 @@ sub Run
}
return (0, "Internal error: '". $sth->err ."'. Please send bug report.") if $sth->err;
- map { $_ = "RT::Attachment-$_" } @objs;
+ @objs = map {"RT::Attachment-$_"} @objs;
return (1, @objs);
}
diff --git a/rt/lib/RT/Shredder/Plugin/Base.pm b/rt/lib/RT/Shredder/Plugin/Base.pm
index a8acf3945..30fa3f320 100644
--- a/rt/lib/RT/Shredder/Plugin/Base.pm
+++ b/rt/lib/RT/Shredder/Plugin/Base.pm
@@ -61,14 +61,14 @@ sub new
{
my $proto = shift;
my $self = bless( {}, ref $proto || $proto );
- $self->_Init( @_ );
- return $self;
+ return $self->_Init( @_ );
}
sub _Init
{
my $self = shift;
$self->{'opt'} = { @_ };
+ return $self;
}
=head1 USAGE
@@ -125,8 +125,9 @@ sub HasSupportForArgs
foreach my $a( @args ) {
push @unsupported, $a unless grep $_ eq $a, $self->SupportArgs;
}
- return( 1 ) unless @unsupported;
- return( 0, "Plugin doesn't support argument(s): @unsupported" ) if @unsupported;
+ return( 0, "Plugin doesn't support argument(s): @unsupported" )
+ if @unsupported;
+ return( 1 );
}
=head3 TestArgs
diff --git a/rt/lib/RT/Shredder/Plugin/Summary.pm b/rt/lib/RT/Shredder/Plugin/Summary.pm
index bd21284ec..7442c6d15 100644
--- a/rt/lib/RT/Shredder/Plugin/Summary.pm
+++ b/rt/lib/RT/Shredder/Plugin/Summary.pm
@@ -76,7 +76,6 @@ sub Run
my $method = 'WriteDown'. $class;
$method = 'WriteDownDefault' unless $self->can($method);
return $self->$method( %args );
- return 1;
}
my %skip_refs_to = ();
@@ -114,8 +113,8 @@ sub WriteDownPrincipal { return 1 }
sub WriteDownGroup {
my $self = shift;
my %args = ( Object => undef, @_ );
- if ( $args{'Object'}->Domain =~ /-Role$/ ) {
- return $skip_refs_to{ $args{'Object'}->_AsString } = 1;
+ if ( $args{'Object'}->RoleClass ) {
+ return $skip_refs_to{ $args{'Object'}->UID } = 1;
}
return $self->WriteDownDefault( %args );
}
@@ -142,7 +141,7 @@ sub WriteDownScrip {
my $props = $self->_MakeHash( $args{'Object'} );
$props->{'Action'} = $args{'Object'}->ActionObj->Name;
$props->{'Condition'} = $args{'Object'}->ConditionObj->Name;
- $props->{'Template'} = $args{'Object'}->TemplateObj->Name;
+ $props->{'Template'} = $args{'Object'}->Template;
$props->{'Queue'} = $args{'Object'}->QueueObj->Name || 'global';
return $self->_WriteDownHash( $args{'Object'}, $props );
@@ -154,7 +153,7 @@ sub _MakeHash {
foreach (grep exists $hash->{$_}, qw(Creator LastUpdatedBy)) {
my $method = $_ .'Obj';
my $u = $obj->$method();
- $hash->{ $_ } = $u->EmailAddress || $u->Name || $u->_AsString;
+ $hash->{ $_ } = $u->EmailAddress || $u->Name || $u->UID;
}
return $hash;
}
@@ -171,7 +170,7 @@ sub _WriteDownHash {
my ($self, $obj, $hash) = @_;
return (0, 'no handle') unless my $fh = $self->{'opt'}{'file_handle'};
- print $fh "=== ". $obj->_AsString ." ===\n"
+ print $fh "=== ". $obj->UID ." ===\n"
or return (0, "Couldn't write to filehandle");
foreach my $key( sort keys %$hash ) {
diff --git a/rt/lib/RT/Shredder/Plugin/Users.pm b/rt/lib/RT/Shredder/Plugin/Users.pm
index 2f6fbd95f..7e1c31f77 100644
--- a/rt/lib/RT/Shredder/Plugin/Users.pm
+++ b/rt/lib/RT/Shredder/Plugin/Users.pm
@@ -79,6 +79,11 @@ be selected for deletion. Identifier is name of user defined group
or id of a group, as well C<Privileged> or <unprivileged> can used
to select people from system groups.
+=head2 not_member_of - group identifier
+
+Like member_of, but selects users who are not members of the provided
+group.
+
=head2 replace_relations - user identifier
When you delete a user there could be minor links to them in the RT database.
@@ -108,7 +113,7 @@ want to use C<replace_relations> option.
sub SupportArgs
{
return $_[0]->SUPER::SupportArgs,
- qw(status name email member_of replace_relations no_tickets);
+ qw(status name email member_of not_member_of replace_relations no_tickets);
}
sub TestArgs
@@ -128,19 +133,22 @@ sub TestArgs
if( $args{'name'} ) {
$args{'name'} = $self->ConvertMaskToSQL( $args{'name'} );
}
- if( $args{'member_of'} ) {
- my $group = RT::Group->new( RT->SystemUser );
- if ( $args{'member_of'} =~ /^(Everyone|Privileged|Unprivileged)$/i ) {
- $group->LoadSystemInternalGroup( $args{'member_of'} );
- }
- else {
- $group->LoadUserDefinedGroup( $args{'member_of'} );
- }
- unless ( $group->id ) {
- return (0, "Couldn't load group '$args{'member_of'}'" );
- }
- $args{'member_of'} = $group->id;
+ if( $args{'member_of'} or $args{'not_member_of'} ) {
+ foreach my $group_option ( qw(member_of not_member_of) ){
+ next unless $args{$group_option};
+ my $group = RT::Group->new( RT->SystemUser );
+ if ( $args{$group_option} =~ /^(Everyone|Privileged|Unprivileged)$/i ) {
+ $group->LoadSystemInternalGroup( $args{$group_option} );
+ }
+ else {
+ $group->LoadUserDefinedGroup( $args{$group_option} );
+ }
+ unless ( $group->id ) {
+ return (0, "Couldn't load group '$args{$group_option}'" );
+ }
+ $args{$group_option} = $group->id;
+ }
}
if( $args{'replace_relations'} ) {
my $uid = $args{'replace_relations'};
@@ -183,20 +191,38 @@ sub Run
$objs->Limit( FIELD => 'Name',
OPERATOR => 'MATCHES',
VALUE => $self->{'opt'}{'name'},
+ CASESENSITIVE => 0,
);
}
if( $self->{'opt'}{'member_of'} ) {
$objs->MemberOfGroup( $self->{'opt'}{'member_of'} );
}
+ my @filter;
+ if( $self->{'opt'}{'not_member_of'} ) {
+ push @filter, $self->FilterNotMemberOfGroup(
+ Shredder => $args{'Shredder'},
+ GroupId => $self->{'opt'}{'not_member_of'},
+ );
+ }
if( $self->{'opt'}{'no_tickets'} ) {
- return $self->FilterWithoutTickets(
+ push @filter, $self->FilterWithoutTickets(
Shredder => $args{'Shredder'},
- Objects => $objs,
);
- } else {
- if( $self->{'opt'}{'limit'} ) {
- $objs->RowsPerPage( $self->{'opt'}{'limit'} );
+ }
+
+ if (@filter) {
+ $self->FetchNext( $objs, 'init' );
+ my @res;
+ USER: while ( my $user = $self->FetchNext( $objs ) ) {
+ for my $filter (@filter) {
+ next USER unless $filter->($user);
+ }
+ push @res, $user;
+ last if $self->{'opt'}{'limit'} && @res >= $self->{'opt'}{'limit'};
}
+ $objs = \@res;
+ } elsif ( $self->{'opt'}{'limit'} ) {
+ $objs->RowsPerPage( $self->{'opt'}{'limit'} );
}
return (1, $objs);
}
@@ -221,6 +247,23 @@ sub SetResolvers
return (1);
}
+sub FilterNotMemberOfGroup {
+ my $self = shift;
+ my %args = (
+ Shredder => undef,
+ GroupId => undef,
+ @_,
+ );
+
+ my $group = RT::Group->new(RT->SystemUser);
+ $group->Load($args{'GroupId'});
+
+ return sub {
+ my $user = shift;
+ not $group->HasMemberRecursively($user->id);
+ };
+}
+
sub FilterWithoutTickets {
my $self = shift;
my %args = (
@@ -228,15 +271,11 @@ sub FilterWithoutTickets {
Objects => undef,
@_,
);
- my $users = $args{Objects};
- $self->FetchNext( $users, 'init' );
- my @res;
- while ( my $user = $self->FetchNext( $users ) ) {
- push @res, $user if $self->_WithoutTickets( $user );
- return (1, \@res) if $self->{'opt'}{'limit'} && @res >= $self->{'opt'}{'limit'};
- }
- return (1, \@res);
+ return sub {
+ my $user = shift;
+ $self->_WithoutTickets( $user )
+ };
}
sub _WithoutTickets {
generated by cgit v1.2.1 (git 2.18.0) at 2025-06-14 12:44:04 +0000