[otrs-cvs] CVS: otrs/Kernel/Modules AgentTicketSearch.pm, 1.26, 1.27 AgentTicketPrint.pm,1.25,1.26 AgentStats.pm,1.10,1.11

cvs-log at otrs.org cvs-log at otrs.org
Wed Aug 23 17:45:04 CEST 2006


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

Modified Files:
	AgentTicketSearch.pm AgentTicketPrint.pm AgentStats.pm 
Log Message:
change core module check

Index: AgentTicketSearch.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketSearch.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** AgentTicketSearch.pm	23 Aug 2006 13:23:57 -0000	1.26
--- AgentTicketSearch.pm	23 Aug 2006 14:45:01 -0000	1.27
***************
*** 45,52 ****
      $Self->{StateObject} = Kernel::System::State->new(%Param);
      $Self->{SearchProfileObject} = Kernel::System::SearchProfile->new(%Param);
!     # load PDF::API2 if installed
!     if ($Self->{MainObject}->Require('PDF::API2')) {
!         $Self->{PDFObject} = Kernel::System::PDF->new(%Param);
!     }
  
      # if we need to do a fulltext search on an external mirror database
--- 45,49 ----
      $Self->{StateObject} = Kernel::System::State->new(%Param);
      $Self->{SearchProfileObject} = Kernel::System::SearchProfile->new(%Param);
!     $Self->{PDFObject} = Kernel::System::PDF->new(%Param);
  
      # if we need to do a fulltext search on an external mirror database
***************
*** 308,312 ****
          );
  
-         my $PDFOutput = $Self->{ConfigObject}->Get('PDF');
          my @CSVHead = ();
          my @CSVData = ();
--- 305,308 ----
***************
*** 420,424 ****
              }
              elsif ($GetParam{ResultForm} eq 'Print') {
!                 if ($PDFOutput && $Self->{PDFObject}) {
                      my %Info = (%Data, %UserInfo),
  
--- 416,420 ----
              }
              elsif ($GetParam{ResultForm} eq 'Print') {
!                 if ($Self->{PDFObject}) {
                      my %Info = (%Data, %UserInfo),
  
***************
*** 507,511 ****
          elsif ($GetParam{ResultForm} eq 'Print') {
              # PDF Output
!             if ($PDFOutput && $Self->{PDFObject}) {
                  my $Title = $Self->{LayoutObject}->{LanguageObject}->Get('Ticket') . ' ' .
                      $Self->{LayoutObject}->{LanguageObject}->Get('Search');
--- 503,507 ----
          elsif ($GetParam{ResultForm} eq 'Print') {
              # PDF Output
!             if ($Self->{PDFObject}) {
                  my $Title = $Self->{LayoutObject}->{LanguageObject}->Get('Ticket') . ' ' .
                      $Self->{LayoutObject}->{LanguageObject}->Get('Search');

Index: AgentTicketPrint.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketPrint.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** AgentTicketPrint.pm	23 Aug 2006 13:23:57 -0000	1.25
--- AgentTicketPrint.pm	23 Aug 2006 14:45:01 -0000	1.26
***************
*** 45,52 ****
      # link object
      $Self->{LinkObject} = Kernel::System::LinkObject->new(%Param);
!     # load PDF::API2 if installed
!     if ($Self->{MainObject}->Require('PDF::API2')) {
!         $Self->{PDFObject} = Kernel::System::PDF->new(%Param);
!     }
  
      return $Self;
--- 45,49 ----
      # link object
      $Self->{LinkObject} = Kernel::System::LinkObject->new(%Param);
!     $Self->{PDFObject} = Kernel::System::PDF->new(%Param);
  
      return $Self;
***************
*** 130,134 ****
  
      # generate pdf output
!     if ($Self->{PDFObject} && $Self->{ConfigObject}->Get('PDF')) {
          my $PrintedBy = $Self->{LayoutObject}->{LanguageObject}->Get('printed by');
          my $Time = $Self->{LayoutObject}->Output(Template => '$Env{"Time"}');
--- 127,131 ----
  
      # generate pdf output
!     if ($Self->{PDFObject}) {
          my $PrintedBy = $Self->{LayoutObject}->{LanguageObject}->Get('printed by');
          my $Time = $Self->{LayoutObject}->Output(Template => '$Env{"Time"}');

Index: AgentStats.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentStats.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AgentStats.pm	23 Aug 2006 13:23:57 -0000	1.10
--- AgentStats.pm	23 Aug 2006 14:45:01 -0000	1.11
***************
*** 41,48 ****
      $Self->{StatsObject} = Kernel::System::Stats->new(%Param);
      $Self->{CSVObject}   = Kernel::System::CSV->new(%Param);
!     # load PDF::API2 if installed
!     if ($Self->{MainObject}->Require('PDF::API2')) {
!         $Self->{PDFObject} = Kernel::System::PDF->new(%Param);
!     }
  
      return $Self;
--- 41,45 ----
      $Self->{StatsObject} = Kernel::System::Stats->new(%Param);
      $Self->{CSVObject}   = Kernel::System::CSV->new(%Param);
!     $Self->{PDFObject}   = Kernel::System::PDF->new(%Param);
  
      return $Self;
***************
*** 1912,1916 ****
          elsif ($Param{Format} eq 'Print') {
              # PDF Output
!             if ($Self->{PDFObject} && $Self->{ConfigObject}->Get('PDF')) {
                  my $PrintedBy = $Self->{LayoutObject}->{LanguageObject}->Get('printed by');
                  my $Page = $Self->{LayoutObject}->{LanguageObject}->Get('Page');
--- 1909,1913 ----
          elsif ($Param{Format} eq 'Print') {
              # PDF Output
!             if ($Self->{PDFObject}) {
                  my $PrintedBy = $Self->{LayoutObject}->{LanguageObject}->Get('printed by');
                  my $Page = $Self->{LayoutObject}->{LanguageObject}->Get('Page');



More information about the cvs-log mailing list