[otrs-cvs] CVS: otrs/Kernel/Modules AgentTicketBounce.pm,1.8,1.9
AgentTicketCompose.pm,1.24,1.25 AgentTicketEmail.pm,1.24,1.25
AgentTicketForward.pm,1.16,1.17 AgentTicketMerge.pm,1.13,1.14
cvs-log at otrs.org
cvs-log at otrs.org
Tue Jan 9 04:23:36 CET 2007
- Previous message: [otrs-cvs] CVS: otrs/Kernel/Output/HTML/Standard
AdminAutoResponseForm.dtl,1.23,1.24 AdminNotificationForm.dtl,1.16,1.17
AdminResponseForm.dtl,1.20,1.21 AdminSalutationForm.dtl,1.23,1.24
AdminSignatureForm.dtl,1.22,1.23
- Next message: [otrs-cvs] CVS: otrs/Kernel/Output/HTML/Standard
AgentTicketMove.dtl, 1.8, 1.9 AgentTicketMerge.dtl, 1.10,
1.11 AgentTicketForward.dtl, 1.19, 1.20 AgentTicketBounce.dtl,
1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv12490/Kernel/Modules
Modified Files:
AgentTicketBounce.pm AgentTicketCompose.pm AgentTicketEmail.pm
AgentTicketForward.pm AgentTicketMerge.pm
Log Message:
added not template tags
Index: AgentTicketBounce.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketBounce.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AgentTicketBounce.pm 15 Nov 2006 07:47:24 -0000 1.8
--- AgentTicketBounce.pm 9 Jan 2007 03:23:34 -0000 1.9
***************
*** 1,5 ****
# --
# Kernel/Modules/AgentTicketBounce.pm - to bounce articles of tickets
! # Copyright (C) 2001-2006 OTRS GmbH, http://otrs.org/
# --
# $Id$
--- 1,5 ----
# --
# Kernel/Modules/AgentTicketBounce.pm - to bounce articles of tickets
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
# --
# $Id$
***************
*** 22,26 ****
$VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
- # --
sub new {
my $Type = shift;
--- 22,25 ----
***************
*** 50,54 ****
return $Self;
}
! # --
sub Run {
my $Self = shift;
--- 49,53 ----
return $Self;
}
!
sub Run {
my $Self = shift;
***************
*** 153,179 ****
$Article{To} = $Article{From};
}
# prepare salutation
$Param{Salutation} = $Self->{QueueObject}->GetSalutation(%Article);
- # prepare customer realname
- if ($Param{Salutation} =~ /<OTRS_CUSTOMER_REALNAME>/) {
- # get realname
- my $From = '';
- if ($Article{CustomerUserID}) {
- $From = $Self->{CustomerUserObject}->CustomerName(UserLogin => $Article{CustomerUserID});
- }
- if (!$From) {
- $From = $Article{From} || '';
- $From =~ s/<.*>|\(.*\)|\"|;|,//g;
- $From =~ s/( $)|( $)//g;
- }
- # get realname
- $Param{Salutation} =~ s/<OTRS_CUSTOMER_REALNAME>/$From/g;
- }
# prepare signature
$Param{Signature} = $Self->{QueueObject}->GetSignature(%Article);
foreach (qw(Signature Salutation)) {
! $Param{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
! $Param{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
! # replace user staff
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
--- 152,182 ----
$Article{To} = $Article{From};
}
+ # get customer data
+ my %Customer = ();
+ if ($Ticket{CustomerUserID}) {
+ %Customer = $Self->{CustomerUserObject}->CustomerUserDataGet(
+ User => $Ticket{CustomerUserID},
+ );
+ }
# prepare salutation
$Param{Salutation} = $Self->{QueueObject}->GetSalutation(%Article);
# prepare signature
$Param{Signature} = $Self->{QueueObject}->GetSignature(%Article);
foreach (qw(Signature Salutation)) {
! # get and prepare realname
! if ($Param{$_} =~ /<OTRS_CUSTOMER_REALNAME>/) {
! my $From = '';
! if ($Ticket{CustomerUserID}) {
! $From = $Self->{CustomerUserObject}->CustomerName(UserLogin => $Ticket{CustomerUserID});
! }
! if (!$From) {
! $From = $Article{From} || '';
! $From =~ s/<.*>|\(.*\)|\"|;|,//g;
! $From =~ s/( $)|( $)//g;
! }
! $Param{$_} =~ s/<OTRS_CUSTOMER_REALNAME>/$From/g;
! }
!
! # current user
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
***************
*** 183,190 ****
if ($User{$UserKey}) {
$Param{$_} =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
}
}
! # cleanup all not needed <OTRS_Agent_tags
$Param{$_} =~ s/<OTRS_Agent_.+?>/-/gi;
foreach my $Key (keys %Ticket) {
if ($Ticket{$Key}) {
--- 186,226 ----
if ($User{$UserKey}) {
$Param{$_} =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
+ $Param{$_} =~ s/<OTRS_CURRENT_$UserKey>/$User{$UserKey}/gi;
}
}
! # replace other needed stuff
! $Param{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
! $Param{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
! # cleanup
$Param{$_} =~ s/<OTRS_Agent_.+?>/-/gi;
+ $Param{$_} =~ s/<OTRS_CURRENT_.+?>/-/gi;
+
+ # owner user
+ my %OwnerUser = $Self->{UserObject}->GetUserData(
+ UserID => $Ticket{OwnerID},
+ Cached => 1,
+ );
+ foreach my $UserKey (keys %OwnerUser) {
+ if ($OwnerUser{$UserKey}) {
+ $Param{$_} =~ s/<OTRS_OWNER_$UserKey>/$OwnerUser{$UserKey}/gi;
+ }
+ }
+ # cleanup
+ $Param{$_} =~ s/<OTRS_OWNER_.+?>/-/gi;
+
+ # responsible user
+ my %ResponsibleUser = $Self->{UserObject}->GetUserData(
+ UserID => $Ticket{ResponsibleID},
+ Cached => 1,
+ );
+ foreach my $UserKey (keys %ResponsibleUser) {
+ if ($ResponsibleUser{$UserKey}) {
+ $Param{$_} =~ s/<OTRS_RESPONSIBLE_$UserKey>/$ResponsibleUser{$UserKey}/gi;
+ }
+ }
+ # cleanup
+ $Param{$_} =~ s/<OTRS_RESPONSIBLE_.+?>/-/gi;
+
+ # replace ticket data
foreach my $Key (keys %Ticket) {
if ($Ticket{$Key}) {
***************
*** 194,197 ****
--- 230,246 ----
# cleanup all not needed <OTRS_TICKET_ tags
$Param{$_} =~ s/<OTRS_TICKET_.+?>/-/gi;
+ # replace customer data
+ foreach my $CustomerKey (keys %Customer) {
+ if ($Customer{$CustomerKey}) {
+ $Param{$_} =~ s/<OTRS_CUSTOMER_$CustomerKey>/$Customer{$CustomerKey}/gi;
+ $Param{$_} =~ s/<OTRS_CUSTOMER_DATA_$CustomerKey>/$Customer{$CustomerKey}/gi;
+ }
+ }
+ # cleanup all not needed <OTRS_CUSTOMER_ tags
+ $Param{$_} =~ s/<OTRS_CUSTOMER_.+?>/-/gi;
+ $Param{$_} =~ s/<OTRS_CUSTOMER_DATA_.+?>/-/gi;
+ # replace config options
+ $Param{$_} =~ s{<OTRS_CONFIG_(.+?)>}{$Self->{ConfigObject}->Get($1)}egx;
+ $Param{$_} =~ s/<OTRS_CONFIG_.+?>/-/gi;
}
# prepare body ...
Index: AgentTicketCompose.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketCompose.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** AgentTicketCompose.pm 8 Jan 2007 20:51:10 -0000 1.24
--- AgentTicketCompose.pm 9 Jan 2007 03:23:34 -0000 1.25
***************
*** 618,622 ****
$Data{$_} =~ s/<OTRS_CUSTOMER_REALNAME>/$From/g;
}
! # replace user staff
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
--- 618,622 ----
$Data{$_} =~ s/<OTRS_CUSTOMER_REALNAME>/$From/g;
}
! # current user
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
***************
*** 626,636 ****
if ($User{$UserKey}) {
$Data{$_} =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
}
}
- # cleanup all not needed <OTRS_TICKET_ tags
- $Data{$_} =~ s/<OTRS_Agent_.+?>/-/gi;
# replace other needed stuff
$Data{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
$Data{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
# replace ticket data
foreach my $TicketKey (keys %Ticket) {
--- 626,666 ----
if ($User{$UserKey}) {
$Data{$_} =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
+ $Data{$_} =~ s/<OTRS_CURRENT_$UserKey>/$User{$UserKey}/gi;
}
}
# replace other needed stuff
$Data{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
$Data{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
+ # cleanup
+ $Data{$_} =~ s/<OTRS_Agent_.+?>/-/gi;
+ $Data{$_} =~ s/<OTRS_CURRENT_.+?>/-/gi;
+
+ # owner user
+ my %OwnerUser = $Self->{UserObject}->GetUserData(
+ UserID => $Ticket{OwnerID},
+ Cached => 1,
+ );
+ foreach my $UserKey (keys %OwnerUser) {
+ if ($OwnerUser{$UserKey}) {
+ $Data{$_} =~ s/<OTRS_OWNER_$UserKey>/$OwnerUser{$UserKey}/gi;
+ }
+ }
+ # cleanup
+ $Data{$_} =~ s/<OTRS_OWNER_.+?>/-/gi;
+
+ # responsible user
+ my %ResponsibleUser = $Self->{UserObject}->GetUserData(
+ UserID => $Ticket{ResponsibleID},
+ Cached => 1,
+ );
+ foreach my $UserKey (keys %ResponsibleUser) {
+ if ($ResponsibleUser{$UserKey}) {
+ $Data{$_} =~ s/<OTRS_RESPONSIBLE_$UserKey>/$ResponsibleUser{$UserKey}/gi;
+ }
+ }
+ # cleanup
+ $Data{$_} =~ s/<OTRS_RESPONSIBLE_.+?>/-/gi;
+
+ # replace other needed stuff
# replace ticket data
foreach my $TicketKey (keys %Ticket) {
***************
*** 645,654 ****
--- 675,687 ----
if ($Customer{$CustomerKey}) {
$Data{$_} =~ s/<OTRS_CUSTOMER_$CustomerKey>/$Customer{$CustomerKey}/gi;
+ $Data{$_} =~ s/<OTRS_CUSTOMER_DATA_$CustomerKey>/$Customer{$CustomerKey}/gi;
}
}
# cleanup all not needed <OTRS_CUSTOMER_ tags
$Data{$_} =~ s/<OTRS_CUSTOMER_.+?>/-/gi;
+ $Data{$_} =~ s/<OTRS_CUSTOMER_DATA_.+?>/-/gi;
# replace config options
$Data{$_} =~ s{<OTRS_CONFIG_(.+?)>}{$Self->{ConfigObject}->Get($1)}egx;
+ $Data{$_} =~ s/<OTRS_CONFIG_.+?>/-/gi;
}
Index: AgentTicketEmail.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketEmail.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** AgentTicketEmail.pm 15 Nov 2006 07:47:24 -0000 1.24
--- AgentTicketEmail.pm 9 Jan 2007 03:23:34 -0000 1.25
***************
*** 1,5 ****
# --
# Kernel/Modules/AgentTicketEmail.pm - to compose inital email to customer
! # Copyright (C) 2001-2006 OTRS GmbH, http://otrs.org/
# --
# $Id$
--- 1,5 ----
# --
# Kernel/Modules/AgentTicketEmail.pm - to compose inital email to customer
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
# --
# $Id$
***************
*** 269,273 ****
$Signature =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
$Signature =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
! # replace user staff
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
--- 269,273 ----
$Signature =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
$Signature =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
! # current user
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
***************
*** 277,284 ****
if ($User{$UserKey}) {
$Signature =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
}
}
! # cleanup all not needed <OTRS_TICKET_ tags
$Signature =~ s/<OTRS_Agent_.+?>/-/gi;
}
my $CustomerUser = $Self->{ParamObject}->GetParam(Param => 'CustomerUser') ||
--- 277,293 ----
if ($User{$UserKey}) {
$Signature =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
+ $Signature =~ s/<OTRS_CURRENT_$UserKey>/$User{$UserKey}/gi;
}
}
! # replace other needed stuff
! $Signature =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
! $Signature =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
! # cleanup
$Signature =~ s/<OTRS_Agent_.+?>/-/gi;
+ $Signature =~ s/<OTRS_CURRENT_.+?>/-/gi;
+
+ # replace config options
+ $Signature =~ s{<OTRS_CONFIG_(.+?)>}{$Self->{ConfigObject}->Get($1)}egx;
+ $Signature =~ s/<OTRS_CONFIG_.+?>/-/gi;
}
my $CustomerUser = $Self->{ParamObject}->GetParam(Param => 'CustomerUser') ||
Index: AgentTicketForward.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketForward.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** AgentTicketForward.pm 29 Sep 2006 16:16:37 -0000 1.16
--- AgentTicketForward.pm 9 Jan 2007 03:23:34 -0000 1.17
***************
*** 1,5 ****
# --
# Kernel/Modules/AgentTicketForward.pm - to forward a message
! # Copyright (C) 2001-2006 OTRS GmbH, http://otrs.org/
# --
# $Id$
--- 1,5 ----
# --
# Kernel/Modules/AgentTicketForward.pm - to forward a message
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
# --
# $Id$
***************
*** 224,228 ****
$Data{$_} =~ s/<OTRS_CUSTOMER_REALNAME>/$From/g;
}
! # replace user staff
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
--- 224,228 ----
$Data{$_} =~ s/<OTRS_CUSTOMER_REALNAME>/$From/g;
}
! # current user
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
***************
*** 232,242 ****
if ($User{$UserKey}) {
$Data{$_} =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
}
}
- # cleanup all not needed <OTRS_TICKET_ tags
- $Data{$_} =~ s/<OTRS_Agent_.+?>/-/gi;
# replace other needed stuff
$Data{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
$Data{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
# replace ticket data
foreach my $TicketKey (keys %Ticket) {
--- 232,271 ----
if ($User{$UserKey}) {
$Data{$_} =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
+ $Data{$_} =~ s/<OTRS_CURRENT_$UserKey>/$User{$UserKey}/gi;
}
}
# replace other needed stuff
$Data{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
$Data{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
+ # cleanup
+ $Data{$_} =~ s/<OTRS_Agent_.+?>/-/gi;
+ $Data{$_} =~ s/<OTRS_CURRENT_.+?>/-/gi;
+
+ # owner user
+ my %OwnerUser = $Self->{UserObject}->GetUserData(
+ UserID => $Ticket{OwnerID},
+ Cached => 1,
+ );
+ foreach my $UserKey (keys %OwnerUser) {
+ if ($OwnerUser{$UserKey}) {
+ $Data{$_} =~ s/<OTRS_OWNER_$UserKey>/$OwnerUser{$UserKey}/gi;
+ }
+ }
+ # cleanup
+ $Data{$_} =~ s/<OTRS_OWNER_.+?>/-/gi;
+
+ # responsible user
+ my %ResponsibleUser = $Self->{UserObject}->GetUserData(
+ UserID => $Ticket{ResponsibleID},
+ Cached => 1,
+ );
+ foreach my $UserKey (keys %ResponsibleUser) {
+ if ($ResponsibleUser{$UserKey}) {
+ $Data{$_} =~ s/<OTRS_RESPONSIBLE_$UserKey>/$ResponsibleUser{$UserKey}/gi;
+ }
+ }
+ # cleanup
+ $Data{$_} =~ s/<OTRS_RESPONSIBLE_.+?>/-/gi;
+
# replace ticket data
foreach my $TicketKey (keys %Ticket) {
***************
*** 251,260 ****
--- 280,292 ----
if ($Customer{$CustomerKey}) {
$Data{$_} =~ s/<OTRS_CUSTOMER_$CustomerKey>/$Customer{$CustomerKey}/gi;
+ $Data{$_} =~ s/<OTRS_CUSTOMER_DATA_$CustomerKey>/$Customer{$CustomerKey}/gi;
}
}
# cleanup all not needed <OTRS_CUSTOMER_ tags
$Data{$_} =~ s/<OTRS_CUSTOMER_.+?>/-/gi;
+ $Data{$_} =~ s/<OTRS_CUSTOMER_DATA.+?>/-/gi;
# replace config options
$Data{$_} =~ s{<OTRS_CONFIG_(.+?)>}{$Self->{ConfigObject}->Get($1)}egx;
+ $Data{$_} =~ s/<OTRS_CONFIG_.+?>/-/gi;
}
# --
Index: AgentTicketMerge.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketMerge.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** AgentTicketMerge.pm 1 Jan 2007 23:18:15 -0000 1.13
--- AgentTicketMerge.pm 9 Jan 2007 03:23:34 -0000 1.14
***************
*** 256,260 ****
$Param{$_} =~ s/<OTRS_CUSTOMER_REALNAME>/$From/g;
}
! # replace user staff
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
--- 256,261 ----
$Param{$_} =~ s/<OTRS_CUSTOMER_REALNAME>/$From/g;
}
!
! # current user
my %User = $Self->{UserObject}->GetUserData(
UserID => $Self->{UserID},
***************
*** 264,274 ****
if ($User{$UserKey}) {
$Param{$_} =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
}
}
- # cleanup all not needed <OTRS_TICKET_ tags
- $Param{$_} =~ s/<OTRS_Agent_.+?>/-/gi;
# replace other needed stuff
$Param{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
$Param{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
# replace ticket data
foreach my $TicketKey (keys %Ticket) {
--- 265,304 ----
if ($User{$UserKey}) {
$Param{$_} =~ s/<OTRS_Agent_$UserKey>/$User{$UserKey}/gi;
+ $Param{$_} =~ s/<OTRS_CURRENT_$UserKey>/$User{$UserKey}/gi;
}
}
# replace other needed stuff
$Param{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
$Param{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
+ # cleanup
+ $Param{$_} =~ s/<OTRS_Agent_.+?>/-/gi;
+ $Param{$_} =~ s/<OTRS_CURRENT_.+?>/-/gi;
+
+ # owner user
+ my %OwnerUser = $Self->{UserObject}->GetUserData(
+ UserID => $Ticket{OwnerID},
+ Cached => 1,
+ );
+ foreach my $UserKey (keys %OwnerUser) {
+ if ($OwnerUser{$UserKey}) {
+ $Param{$_} =~ s/<OTRS_OWNER_$UserKey>/$OwnerUser{$UserKey}/gi;
+ }
+ }
+ # cleanup
+ $Param{$_} =~ s/<OTRS_OWNER_.+?>/-/gi;
+
+ # responsible user
+ my %ResponsibleUser = $Self->{UserObject}->GetUserData(
+ UserID => $Ticket{ResponsibleID},
+ Cached => 1,
+ );
+ foreach my $UserKey (keys %ResponsibleUser) {
+ if ($ResponsibleUser{$UserKey}) {
+ $Param{$_} =~ s/<OTRS_RESPONSIBLE_$UserKey>/$ResponsibleUser{$UserKey}/gi;
+ }
+ }
+ # cleanup
+ $Param{$_} =~ s/<OTRS_RESPONSIBLE_.+?>/-/gi;
+
# replace ticket data
foreach my $TicketKey (keys %Ticket) {
***************
*** 283,292 ****
--- 313,325 ----
if ($Customer{$CustomerKey}) {
$Param{$_} =~ s/<OTRS_CUSTOMER_$CustomerKey>/$Customer{$CustomerKey}/gi;
+ $Param{$_} =~ s/<OTRS_CUSTOMER_DATA_$CustomerKey>/$Customer{$CustomerKey}/gi;
}
}
# cleanup all not needed <OTRS_CUSTOMER_ tags
$Param{$_} =~ s/<OTRS_CUSTOMER_.+?>/-/gi;
+ $Param{$_} =~ s/<OTRS_CUSTOMER_DATA_.+?>/-/gi;
# replace config options
$Param{$_} =~ s{<OTRS_CONFIG_(.+?)>}{$Self->{ConfigObject}->Get($1)}egx;
+ $Param{$_} =~ s/<OTRS_CONFIG_.+?>/-/gi;
}
$Output .= $Self->{LayoutObject}->Output(TemplateFile => 'AgentTicketMerge', Data => {%Param,%Ticket, %Article});
- Previous message: [otrs-cvs] CVS: otrs/Kernel/Output/HTML/Standard
AdminAutoResponseForm.dtl,1.23,1.24 AdminNotificationForm.dtl,1.16,1.17
AdminResponseForm.dtl,1.20,1.21 AdminSalutationForm.dtl,1.23,1.24
AdminSignatureForm.dtl,1.22,1.23
- Next message: [otrs-cvs] CVS: otrs/Kernel/Output/HTML/Standard
AgentTicketMove.dtl, 1.8, 1.9 AgentTicketMerge.dtl, 1.10,
1.11 AgentTicketForward.dtl, 1.19, 1.20 AgentTicketBounce.dtl,
1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs-log
mailing list