diff options
Diffstat (limited to 'rt/etc/upgrade/4.0.1/content')
| -rw-r--r-- | rt/etc/upgrade/4.0.1/content | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/rt/etc/upgrade/4.0.1/content b/rt/etc/upgrade/4.0.1/content index 9b74ff1a8..cc3b5f14a 100644 --- a/rt/etc/upgrade/4.0.1/content +++ b/rt/etc/upgrade/4.0.1/content @@ -1,40 +1,44 @@ -@Initial = ( +use strict; +use warnings; + +our @Initial = ( sub { - use strict; - $RT::Logger->debug('Removing all delegated rights'); + RT->Logger->debug('Removing all delegated rights'); my $acl = RT::ACL->new(RT->SystemUser); - my $groupjoin = $acl->NewAlias('Groups'); - $acl->Join( ALIAS1 => 'main', - FIELD1 => 'PrincipalId', - ALIAS2 => $groupjoin, - FIELD2 => 'id' - ); + my $groupjoin = $acl->Join( + ALIAS1 => 'main', + FIELD1 => 'PrincipalId', + TABLE2 => 'Groups', + FIELD2 => 'id', + ); $acl->Limit( ALIAS => $groupjoin, FIELD => 'Domain', OPERATOR => '=', VALUE => 'Personal', + CASESENSITIVE => 0, ); while ( my $ace = $acl->Next ) { my ( $ok, $msg ) = $ace->Delete(); if ( !$ok ) { - $RT::Logger->warn( "Unable to delete ACE " . $ace->id . ": " . $msg ); + RT->Logger->warn( "Unable to delete ACE " . $ace->id . ": " . $msg ); } } my $groups = RT::Groups->new(RT->SystemUser); $groups->Limit( FIELD => 'Domain', OPERATOR => '=', - VALUE => 'Personal' + VALUE => 'Personal', + CASESENSITIVE => 0, ); while ( my $group = $groups->Next ) { my $members = $group->MembersObj(); while ( my $member = $members->Next ) { my ( $ok, $msg ) = $group->DeleteMember( $member->MemberId ); if ( !$ok ) { - $RT::Logger->warn( "Unable to remove group member " + RT->Logger->warn( "Unable to remove group member " . $member->id . ": " . $msg ); } @@ -44,8 +48,7 @@ } }, sub { - use strict; - $RT::Logger->debug('Removing all Delegate and PersonalGroup rights'); + RT->Logger->debug('Removing all Delegate and PersonalGroup rights'); my $acl = RT::ACL->new(RT->SystemUser); for my $right (qw/AdminOwnPersonalGroups AdminAllPersonalGroups DelegateRights/) { @@ -54,16 +57,15 @@ while ( my $ace = $acl->Next ) { my ( $ok, $msg ) = $ace->Delete(); - $RT::Logger->debug("Removing ACE ".$ace->id." for right ".$ace->__Value('RightName')); + RT->Logger->debug("Removing ACE ".$ace->id." for right ".$ace->__Value('RightName')); if ( !$ok ) { - $RT::Logger->warn( "Unable to delete ACE " . $ace->id . ": " . $msg ); + RT->Logger->warn( "Unable to delete ACE " . $ace->id . ": " . $msg ); } } }, sub { - use strict; - $RT::Logger->debug('Removing unimplemented RejectTicket and ModifyTicketStatus rights'); + RT->Logger->debug('Removing unimplemented RejectTicket and ModifyTicketStatus rights'); my $acl = RT::ACL->new(RT->SystemUser); for my $right (qw/RejectTicket ModifyTicketStatus/) { @@ -72,10 +74,10 @@ while ( my $ace = $acl->Next ) { my ( $ok, $msg ) = $ace->Delete(); - $RT::Logger->debug("Removing ACE ".$ace->id." for right ".$ace->__Value('RightName')); + RT->Logger->debug("Removing ACE ".$ace->id." for right ".$ace->__Value('RightName')); if ( !$ok ) { - $RT::Logger->warn( "Unable to delete ACE " . $ace->id . ": " . $msg ); + RT->Logger->warn( "Unable to delete ACE " . $ace->id . ": " . $msg ); } } }, |