[otrs-cvs] CVS: otrs/Kernel/Modules AgentTicketForward.pm, 1.13, 1.14 AgentTicketCompose.pm,1.16,1.17

[cvs-log at otrs.org]

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

Modified Files:
	AgentTicketForward.pm AgentTicketCompose.pm 
Log Message:
added replacement of \t in qoute of emails

Index: AgentTicketForward.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketForward.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** AgentTicketForward.pm	4 Mar 2006 11:34:53 -0000	1.13
--- AgentTicketForward.pm	20 Jul 2006 12:26:49 -0000	1.14
***************
*** 56,60 ****
        AttachmentDelete1 AttachmentDelete2 AttachmentDelete3 AttachmentDelete4
        AttachmentDelete5 AttachmentDelete6 AttachmentDelete7 AttachmentDelete8
!       AttachmentDelete9 AttachmentDelete10 FormID)) {
          my $Value = $Self->{ParamObject}->GetParam(Param => $_);
  #        $Self->{GetParam}->{$_} = defined $Value ? $Value : '';
--- 56,62 ----
        AttachmentDelete1 AttachmentDelete2 AttachmentDelete3 AttachmentDelete4
        AttachmentDelete5 AttachmentDelete6 AttachmentDelete7 AttachmentDelete8
!       AttachmentDelete9 AttachmentDelete10 AttachmentDelete11 AttachmentDelete12
!       AttachmentDelete13 AttachmentDelete14 AttachmentDelete15 AttachmentDelete16
!         FormID)) {
          my $Value = $Self->{ParamObject}->GetParam(Param => $_);
  #        $Self->{GetParam}->{$_} = defined $Value ? $Value : '';
***************
*** 236,241 ****
          $Data{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
          $Data{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
-         $Data{$_} =~ s/<OTRS_USER_ID>/$Self->{UserID}/g;
-         $Data{$_} =~ s/<OTRS_USER_LOGIN>/$Self->{UserLogin}/g;
          # replace ticket data
          foreach my $TicketKey (keys %Ticket) {
--- 238,241 ----
***************
*** 273,280 ****
      my $NewLine = $Self->{ConfigObject}->Get('Ticket::Frontend::TextAreaEmail') || 75;
      $Data{Body} =~ s/(^>.+|.{4,$NewLine})(?:\s|\z)/$1\n/gm;
! ############
! #    $Data{Body} =~ s/\n/\n> /g;
! #    $Data{Body} = "\n> " . $Data{Body};
! ############
      if ($Data{Created}) {
          $Data{Body} = "Date: $Data{Created}\n".$Data{Body};
--- 273,285 ----
      my $NewLine = $Self->{ConfigObject}->Get('Ticket::Frontend::TextAreaEmail') || 75;
      $Data{Body} =~ s/(^>.+|.{4,$NewLine})(?:\s|\z)/$1\n/gm;
!     $Data{Body} =~ s/\t/ /g;
!     my $Quote = $Self->{ConfigObject}->Get('Ticket::Frontend::Quote');
!     if ($Quote) {
!         $Data{Body} =~ s/\n/\n$Quote /g;
!         $Data{Body} = "\n$Quote " . $Data{Body};
!     }
!     else {
!         $Data{Body} = "\n".$Data{Body};
!     }
      if ($Data{Created}) {
          $Data{Body} = "Date: $Data{Created}\n".$Data{Body};
***************
*** 387,391 ****
      }
      # attachment delete
!     foreach (1..10) {
          if ($GetParam{"AttachmentDelete$_"}) {
              $Error{AttachmentDelete} = 1;
--- 392,396 ----
      }
      # attachment delete
!     foreach (1..16) {
          if ($GetParam{"AttachmentDelete$_"}) {
              $Error{AttachmentDelete} = 1;

Index: AgentTicketCompose.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketCompose.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** AgentTicketCompose.pm	22 Mar 2006 22:30:36 -0000	1.16
--- AgentTicketCompose.pm	20 Jul 2006 12:26:49 -0000	1.17
***************
*** 161,165 ****
          AttachmentDelete1 AttachmentDelete2 AttachmentDelete3 AttachmentDelete4
          AttachmentDelete5 AttachmentDelete6 AttachmentDelete7 AttachmentDelete8
!         AttachmentDelete9 AttachmentDelete10 FormID)) {
              $GetParam{$_} = $Self->{ParamObject}->GetParam(Param => $_);
      }
--- 161,167 ----
          AttachmentDelete1 AttachmentDelete2 AttachmentDelete3 AttachmentDelete4
          AttachmentDelete5 AttachmentDelete6 AttachmentDelete7 AttachmentDelete8
!         AttachmentDelete9 AttachmentDelete10 AttachmentDelete11 AttachmentDelete12
!         AttachmentDelete13 AttachmentDelete14 AttachmentDelete15 AttachmentDelete16
!         FormID)) {
              $GetParam{$_} = $Self->{ParamObject}->GetParam(Param => $_);
      }
***************
*** 194,198 ****
          }
          # attachment delete
!         foreach (1..10) {
              if ($GetParam{"AttachmentDelete$_"}) {
                  $Error{AttachmentDelete} = 1;
--- 196,200 ----
          }
          # attachment delete
!         foreach (1..16) {
              if ($GetParam{"AttachmentDelete$_"}) {
                  $Error{AttachmentDelete} = 1;
***************
*** 397,402 ****
                      defined($GetParam{"TicketFreeTime".$_."Hour"}) &&
                      defined($GetParam{"TicketFreeTime".$_."Minute"})) {
!                     $Self->{TicketObject}->TicketFreeTimeSet(
                          %GetParam,
                          TicketID => $Self->{TicketID},
                          Counter => $_,
--- 399,408 ----
                      defined($GetParam{"TicketFreeTime".$_."Hour"}) &&
                      defined($GetParam{"TicketFreeTime".$_."Minute"})) {
!                     my %Time = $Self->{LayoutObject}->TransfromDateSelection(
                          %GetParam,
+                         Prefix => "TicketFreeTime".$_,
+                     );
+                     $Self->{TicketObject}->TicketFreeTimeSet(
+                         %Time,
                          TicketID => $Self->{TicketID},
                          Counter => $_,
***************
*** 527,530 ****
--- 533,537 ----
              my $NewLine = $Self->{ConfigObject}->Get('Ticket::Frontend::TextAreaEmail') || 75;
              $Data{Body} =~ s/(^>.+|.{4,$NewLine})(?:\s|\z)/$1\n/gm;
+             $Data{Body} =~ s/\t/ /g;
              my $Quote = $Self->{ConfigObject}->Get('Ticket::Frontend::Quote');
              if ($Quote) {
***************
*** 533,536 ****
--- 540,544 ----
              }
              else {
+                 $Data{Body} = "\n".$Data{Body};
                  if ($Data{Created}) {
                      $Data{Body} = "Date: $Data{Created}\n".$Data{Body};
***************
*** 585,592 ****
          $Data{OrigFrom} = $Data{From};
          my %Address = $Self->{QueueObject}->GetSystemAddress(%Ticket);
- #########
          $Data{From} = "$Address{RealName} <$Address{Email}>";
-         $Data{From} = "\"$Self->{UserLastname} $Self->{UserFirstname} via OTRS\" <$Address{Email}>";
- #########
          $Data{Email} = $Address{Email};
          $Data{RealName} = $Address{RealName};
--- 593,597 ----
***************
*** 626,631 ****
              $Data{$_} =~ s/<OTRS_FIRST_NAME>/$Self->{UserFirstname}/g;
              $Data{$_} =~ s/<OTRS_LAST_NAME>/$Self->{UserLastname}/g;
-             $Data{$_} =~ s/<OTRS_USER_ID>/$Self->{UserID}/g;
-             $Data{$_} =~ s/<OTRS_USER_LOGIN>/$Self->{UserLogin}/g;
              # replace ticket data
              foreach my $TicketKey (keys %Ticket) {
--- 631,634 ----