[otrs-cvs] CVS: otrs/Kernel/Modules AgentTicketEmail.pm,1.18,1.19

[cvs-log at otrs.org]

Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv28259/Kernel/Modules

Modified Files:
	AgentTicketEmail.pm 
Log Message:
added Type option to TicketSubjectBuild() for new email tickets without RE in new subject

Index: AgentTicketEmail.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketEmail.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** AgentTicketEmail.pm	11 Jul 2006 14:27:09 -0000	1.18
--- AgentTicketEmail.pm	24 Jul 2006 09:08:53 -0000	1.19
***************
*** 82,86 ****
          AttachmentDelete1 AttachmentDelete2 AttachmentDelete3 AttachmentDelete4
          AttachmentDelete5 AttachmentDelete6 AttachmentDelete7 AttachmentDelete8
!         AttachmentDelete9 AttachmentDelete10 )) {
          $GetParam{$_} = $Self->{ParamObject}->GetParam(Param => $_);
      }
--- 82,87 ----
          AttachmentDelete1 AttachmentDelete2 AttachmentDelete3 AttachmentDelete4
          AttachmentDelete5 AttachmentDelete6 AttachmentDelete7 AttachmentDelete8
!         AttachmentDelete9 AttachmentDelete10 AttachmentDelete11 AttachmentDelete12
!         AttachmentDelete13 AttachmentDelete14 AttachmentDelete15 AttachmentDelete16)) {
          $GetParam{$_} = $Self->{ParamObject}->GetParam(Param => $_);
      }
***************
*** 268,273 ****
              $Signature =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
              $Signature =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
!             $Signature =~ s/<OTRS_USER_ID>/$Self->{UserID}/g;
!             $Signature =~ s/<OTRS_USER_LOGIN>/$Self->{UserLogin}/g;
          }
          my $CustomerUser = $Self->{ParamObject}->GetParam(Param => 'CustomerUser') || $Self->{ParamObject}->GetParam(Param => 'PreSelectedCustomerUser') || $Self->{ParamObject}->GetParam(Param => 'SelectedCustomerUser') || '';
--- 269,284 ----
              $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},
!                 Cached => 1,
!             );
!             foreach my $UserKey (keys %User) {
!                 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') || $Self->{ParamObject}->GetParam(Param => 'PreSelectedCustomerUser') || $Self->{ParamObject}->GetParam(Param => 'SelectedCustomerUser') || '';
***************
*** 346,350 ****
          }
          # attachment delete
!         foreach (1..10) {
              if ($GetParam{"AttachmentDelete$_"}) {
                  $Error{AttachmentDelete} = 1;
--- 357,361 ----
          }
          # attachment delete
!         foreach (1..16) {
              if ($GetParam{"AttachmentDelete$_"}) {
                  $Error{AttachmentDelete} = 1;
***************
*** 688,691 ****
--- 699,703 ----
              TicketNumber => $Tn,
              Subject => $GetParam{Subject} || '',
+             Type => 'New',
          );
          $GetParam{Body} .= "\n\n".$Signature;