Skip to content

Commit

Permalink
Merge branch '5.0/check-if-queue-address-is-user' into 5.0-trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
sunnavy committed May 10, 2024
2 parents d095c61 + ec1998f commit a8bb935
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions share/html/Admin/Queues/Modify.html
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,18 @@
if ( !$QueueObj->SLADisabled && !( RT->Config->Get('ServiceAgreements') && keys %{RT->Config->Get('ServiceAgreements')}) ) {
push @no_redirect_results, loc("You enabled [_1] but [_2] hasn't been configured in RT_SiteConfig.pm, please check '[_3]' for more help", 'SLA', '%ServiceAgreements', 'docs/customizing/sla.pod');
}
for my $address ( $QueueObj->CorrespondAddress, $QueueObj->CommentAddress ) {
next unless $address;
my $user = RT::User->new( $session{'CurrentUser'} );
$user->LoadByEmail($address);
if ( $user->Id && !$user->Disabled ) {
push @no_redirect_results,
loc(
"The address [_1] is already in use by user [_2]. We recommend that you pick another address to avoid email loops and complications with email signing and key management.",
$address, $user->Name
);
}
}
} else {
$title = loc("Create a queue");
}
Expand Down

0 comments on commit a8bb935

Please sign in to comment.