"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Kernel/Modules/AgentTicketBounce.pm" between
otrs-5.0.39.tar.bz2 and otrs-5.0.40.tar.bz2

About: OTRS (formerly "Open Ticket Request System" now "Open Technology – Real Service") is a web-based ticketing systems used for Customer Service, Help Desk, IT Service Management. 5.x release ("Community Edition").

AgentTicketBounce.pm  (otrs-5.0.39.tar.bz2):AgentTicketBounce.pm  (otrs-5.0.40.tar.bz2)
skipping to change at line 330 skipping to change at line 330
# ------------------------------------------------------------ # # ------------------------------------------------------------ #
# bounce # bounce
# ------------------------------------------------------------ # # ------------------------------------------------------------ #
elsif ( $Self->{Subaction} eq 'Store' ) { elsif ( $Self->{Subaction} eq 'Store' ) {
# challenge token check for write action # challenge token check for write action
$LayoutObject->ChallengeTokenCheck(); $LayoutObject->ChallengeTokenCheck();
# get params # get params
for my $Parameter (qw(From BounceTo To Subject Body InformSender BounceS tateID)) { for my $Parameter (qw(BounceTo To Subject Body InformSender BounceStateI D)) {
$Param{$Parameter} $Param{$Parameter}
= $Kernel::OM->Get('Kernel::System::Web::Request')->GetParam( Pa ram => $Parameter ) || ''; = $Kernel::OM->Get('Kernel::System::Web::Request')->GetParam( Pa ram => $Parameter ) || '';
} }
my %Error; my %Error;
# check forward email address # check forward email address
if ( !$Param{BounceTo} ) { if ( !$Param{BounceTo} ) {
$Error{'BounceToInvalid'} = 'ServerError'; $Error{'BounceToInvalid'} = 'ServerError';
$LayoutObject->Block( Name => 'BounceToCustomerGenericServerErrorMsg ' ); $LayoutObject->Block( Name => 'BounceToCustomerGenericServerErrorMsg ' );
skipping to change at line 457 skipping to change at line 457
ArticleID => $Self->{ArticleID}, ArticleID => $Self->{ArticleID},
}, },
); );
$Output .= $LayoutObject->Footer( $Output .= $LayoutObject->Footer(
Type => 'Small', Type => 'Small',
); );
return $Output; return $Output;
} }
my $From = $Kernel::OM->Get('Kernel::System::TemplateGenerator')->Sender
(
QueueID => $Ticket{QueueID},
UserID => $Self->{UserID},
);
my $Bounce = $TicketObject->ArticleBounce( my $Bounce = $TicketObject->ArticleBounce(
TicketID => $Self->{TicketID}, TicketID => $Self->{TicketID},
ArticleID => $Self->{ArticleID}, ArticleID => $Self->{ArticleID},
UserID => $Self->{UserID}, UserID => $Self->{UserID},
To => $Param{BounceTo}, To => $Param{BounceTo},
From => $Param{From}, From => $From,
HistoryType => 'Bounce', HistoryType => 'Bounce',
); );
# error page # error page
if ( !$Bounce ) { if ( !$Bounce ) {
return $LayoutObject->ErrorScreen( return $LayoutObject->ErrorScreen(
Message => Translatable('Can\'t bounce email!'), Message => Translatable('Can\'t bounce email!'),
Comment => Translatable('Please contact the administrator.'), Comment => Translatable('Please contact the administrator.'),
); );
} }
skipping to change at line 499 skipping to change at line 504
$Param{Body} =~ s/(&lt;|<)OTRS_TICKET(&gt;|>)/$Ticket{TicketNumber}/ g; $Param{Body} =~ s/(&lt;|<)OTRS_TICKET(&gt;|>)/$Ticket{TicketNumber}/ g;
$Param{Body} =~ s/(&lt;|<)OTRS_BOUNCE_TO(&gt;|>)/$Param{BounceTo}/g; $Param{Body} =~ s/(&lt;|<)OTRS_BOUNCE_TO(&gt;|>)/$Param{BounceTo}/g;
# send # send
my $ArticleID = $TicketObject->ArticleSend( my $ArticleID = $TicketObject->ArticleSend(
ArticleType => 'email-external', ArticleType => 'email-external',
SenderType => 'agent', SenderType => 'agent',
TicketID => $Self->{TicketID}, TicketID => $Self->{TicketID},
HistoryType => 'Bounce', HistoryType => 'Bounce',
HistoryComment => "Bounced info to '$Param{To}'.", HistoryComment => "Bounced info to '$Param{To}'.",
From => $Param{From}, From => $From,
Email => $Param{Email}, Email => $Param{Email},
To => $Param{To}, To => $Param{To},
Subject => $Param{Subject}, Subject => $Param{Subject},
UserID => $Self->{UserID}, UserID => $Self->{UserID},
Body => $Param{Body}, Body => $Param{Body},
Charset => $LayoutObject->{UserCharset}, Charset => $LayoutObject->{UserCharset},
MimeType => $MimeType, MimeType => $MimeType,
); );
# error page # error page
 End of changes. 4 change blocks. 
3 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)