[otrs-cvs] CVS: otrs/bin/cgi-bin installer.pl, 1.20, 1.21 public.pl, 1.2, 1.3

cvs-log at otrs.org cvs-log at otrs.org
Thu Nov 2 13:21:03 CET 2006


Update of /home/cvs/otrs/bin/cgi-bin
In directory lancelot:/tmp/cvs-serv11671/bin/cgi-bin

Modified Files:
	installer.pl public.pl 
Log Message:
removed # --

Index: installer.pl
===================================================================
RCS file: /home/cvs/otrs/bin/cgi-bin/installer.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** installer.pl	5 Oct 2006 05:22:54 -0000	1.20
--- installer.pl	2 Nov 2006 12:20:59 -0000	1.21
***************
*** 32,43 ****
  $VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
  
- # --
  # check @INC for mod_perl (add lib path for "require module"!)
- # --
  push (@INC, "$Bin/../..", "$Bin/../../Kernel/cpan-lib");
  
- # --
  # all OTRS Installer modules
- # --
  use Kernel::Config;
  use Kernel::System::Log;
--- 32,39 ----
***************
*** 50,56 ****
  use Kernel::Output::HTML::Layout;
  
- # --
  # create common objects
- # --
  my %CommonObject = ();
  $CommonObject{ConfigObject} = Kernel::Config->new();
--- 46,50 ----
***************
*** 73,79 ****
  $CommonObject{LayoutObject} = Kernel::Output::HTML::Layout->new(%CommonObject);
  
- # --
  # get common parameters
- # --
  my %Param = ();
  $Param{Action} = $CommonObject{ParamObject}->GetParam(Param => 'Action') || 'Installer';
--- 67,71 ----
***************
*** 81,87 ****
  $Param{NextScreen} = $CommonObject{ParamObject}->GetParam(Param => 'NextScreen') || '';
  
- # --
  # check secure mode
- # --
  if ($CommonObject{ConfigObject}->Get('SecureMode')) {
      print $CommonObject{LayoutObject}->Header();
--- 73,77 ----
***************
*** 92,98 ****
      print $CommonObject{LayoutObject}->Footer();
  }
! # --
  # run modules if exists a version value
- # --
  elsif (eval '$Kernel::Modules::'. $Param{Action} .'::VERSION'){
      $CommonObject{LayoutObject} = Kernel::Output::HTML::Layout->new(
--- 82,87 ----
      print $CommonObject{LayoutObject}->Footer();
  }
! 
  # run modules if exists a version value
  elsif (eval '$Kernel::Modules::'. $Param{Action} .'::VERSION'){
      $CommonObject{LayoutObject} = Kernel::Output::HTML::Layout->new(
***************
*** 102,108 ****
      GenericModules(%CommonObject, %Param);
  }
! # --
  # else print an error screen
- # --
  else {
      # create new LayoutObject with '%Param'
--- 91,96 ----
      GenericModules(%CommonObject, %Param);
  }
! 
  # else print an error screen
  else {
      # create new LayoutObject with '%Param'
***************
*** 114,120 ****
      print $CommonObject{LayoutObject}->Footer();
  }
! # --
  # debug info
- # --
  if ($Debug) {
      $CommonObject{LogObject}->Log(
--- 102,107 ----
      print $CommonObject{LayoutObject}->Footer();
  }
! 
  # debug info
  if ($Debug) {
      $CommonObject{LogObject}->Log(
***************
*** 124,130 ****
  }
  
- # --
  # generic funktion
- # --
  sub GenericModules {
      my %Data = @_;
--- 111,115 ----
***************
*** 138,149 ****
      }
  
-     # --
      # prove of concept! - create $GenericObject
-     # --
      my $GenericObject = ('Kernel::Modules::' . $Data{Action})->new (%Data);
  
-     # --
      # ->Run $Action with $GenericObject
-     # --
      print $GenericObject->Run();
  
--- 123,130 ----
***************
*** 155,159 ****
          );
      }
- 
  }
- 
--- 136,138 ----

Index: public.pl
===================================================================
RCS file: /home/cvs/otrs/bin/cgi-bin/public.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** public.pl	26 Aug 2006 17:29:03 -0000	1.2
--- public.pl	2 Nov 2006 12:20:59 -0000	1.3
***************
*** 32,43 ****
  $VERSION =~ s/^\$.*:\W(.*)\W.+?$/$1/;
  
- # --
  # 0=off;1=on;
- # --
  my $Debug = 0;
  
- # --
  # check @INC for mod_perl (add lib path for "require module"!)
- # --
  push (@INC, "$Bin/../..", "$Bin/../../Kernel/cpan-lib");
  
--- 32,39 ----
***************
*** 50,52 ****
  # execute object
  $Interface->Run();
- 
--- 46,47 ----



More information about the cvs-log mailing list