[otrs-cvs] otrs/Kernel/Modules AgentTicketQueue.pm,1.46,1.47

[CVS commits notifications of OTRS.org]

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

Modified Files:
	AgentTicketQueue.pm 
Log Message:
Added strip option of empty lines in shown ticket/article body.

Author: martin

Index: AgentTicketQueue.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketQueue.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** AgentTicketQueue.pm	28 Mar 2008 11:42:24 -0000	1.46
--- AgentTicketQueue.pm	29 Apr 2008 22:50:14 -0000	1.47
***************
*** 434,440 ****
  
      # check if just a only html email
!     if ( my $MimeTypeText
!         = $Self->{LayoutObject}->CheckMimeType( %Article, Action => 'AgentTicketZoom' ) )
!     {
          $Article{BodyNote} = $MimeTypeText;
          $Article{Body}     = '';
--- 434,442 ----
  
      # check if just a only html email
!     my $MimeTypeText = $Self->{LayoutObject}->CheckMimeType(
!         %Article,
!         Action => 'AgentTicketZoom',
!     );
!     if ( $MimeTypeText ) {
          $Article{BodyNote} = $MimeTypeText;
          $Article{Body}     = '';
***************
*** 444,463 ****
          # html quoting
          $Article{Body} = $Self->{LayoutObject}->Ascii2Html(
!             NewLine        => $Self->{ConfigObject}->Get('DefaultViewNewLine'),
!             Text           => $Article{Body},
!             VMax           => $Self->{ConfigObject}->Get('DefaultPreViewLines') || 25,
!             LinkFeature    => 1,
!             HTMLResultMode => 1,
          );
  
          # do charset check
!         if (my $CharsetText = $Self->{LayoutObject}->CheckCharset(
                  Action         => 'AgentTicketZoom',
                  ContentCharset => $Article{ContentCharset},
                  TicketID       => $Article{TicketID},
                  ArticleID      => $Article{ArticleID}
!             )
!             )
!         {
              $Article{BodyNote} = $CharsetText;
          }
--- 446,465 ----
          # html quoting
          $Article{Body} = $Self->{LayoutObject}->Ascii2Html(
!             NewLine         => $Self->{ConfigObject}->Get('DefaultViewNewLine'),
!             Text            => $Article{Body},
!             VMax            => $Self->{ConfigObject}->Get('DefaultPreViewLines') || 25,
!             LinkFeature     => 1,
!             HTMLResultMode  => 1,
!             StripEmptyLines => 1,
          );
  
          # do charset check
!         my $CharsetText = $Self->{LayoutObject}->CheckCharset(
                  Action         => 'AgentTicketZoom',
                  ContentCharset => $Article{ContentCharset},
                  TicketID       => $Article{TicketID},
                  ArticleID      => $Article{ArticleID}
!         );
!         if ( $CharsetText ) {
              $Article{BodyNote} = $CharsetText;
          }