X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=97a2f45f4918160aa9aeba59fe291bba9fc3e0a9;hb=debd14edcc23a6168e827be861a052f396aee901;hp=a2aa87e85eb6b85723f04971eec8229c5b647dac;hpb=43b16238344f6c4203db6b660f9d2e68807d4643;p=kivitendo-erp.git

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index a2aa87e85..97a2f45f4 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -12,6 +12,10 @@ use Config::Std;
 use DateTime;
 use Encode;
 use English qw(-no_match_vars);
+use File::Basename;
+use List::MoreUtils qw(all);
+use List::Util qw(first);
+use POSIX;
 use SL::Auth;
 use SL::LXDebug;
 use SL::LxOfficeConf;
@@ -19,13 +23,15 @@ use SL::Locale;
 use SL::Common;
 use SL::Form;
 use SL::Helper::DateTime;
-use List::Util qw(first);
-use File::Basename;
+use SL::InstanceConfiguration;
+use SL::Template::Plugin::HTMLFixes;
 
 # Trailing new line is added so that Perl will not add the line
 # number 'die' was called in.
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 
+my %fcgi_file_cache;
+
 sub new {
   my ($class, $interface) = @_;
 
@@ -41,6 +47,8 @@ sub interface_type {
 }
 
 sub pre_request_checks {
+  _check_for_old_config_files();
+
   if (!$::auth->session_tables_present) {
     if ($::form->{script} eq 'admin.pl') {
       ::run();
@@ -49,7 +57,6 @@ sub pre_request_checks {
       show_error('login/auth_db_unreachable');
     }
   }
-  $::auth->expire_sessions;
 }
 
 sub show_error {
@@ -71,8 +78,9 @@ sub show_error {
 }
 
 sub pre_startup_setup {
+  my ($self) = @_;
+
   SL::LxOfficeConf->read;
-  _init_environment();
 
   eval {
     package main;
@@ -84,6 +92,7 @@ sub pre_startup_setup {
   {
     no warnings 'once';
     $::lxdebug     = LXDebug->new;
+    $::auth        = SL::Auth->new;
     $::form        = undef;
     %::myconfig    = ();
     %::called_subs = (); # currently used for recursion detection
@@ -91,7 +100,9 @@ sub pre_startup_setup {
 
   $SIG{__WARN__} = sub {
     $::lxdebug->warn(@_);
-  }
+  };
+
+  $self->_cache_file_modification_times;
 }
 
 sub pre_startup_checks {
@@ -99,8 +110,9 @@ sub pre_startup_checks {
 }
 
 sub pre_startup {
-  pre_startup_setup();
-  pre_startup_checks();
+  my ($self) = @_;
+  $self->pre_startup_setup;
+  $self->pre_startup_checks;
 }
 
 sub require_main_code {
@@ -156,11 +168,16 @@ sub handle_request {
 
   $self->unrequire_bin_mozilla;
 
-  $::auth        = SL::Auth->new;
-  $::cgi         = CGI->new('');
-  $::locale      = Locale->new($::lx_office_conf{system}->{language});
-  $::form        = Form->new;
-  %::called_subs = ();
+  $::cgi           = CGI->new('');
+  $::locale        = Locale->new($::lx_office_conf{system}->{language});
+  $::form          = Form->new;
+  %::called_subs   = ();
+  $::instance_conf = SL::InstanceConfiguration->new;
+
+  my $session_result = $::auth->restore_session;
+  $::auth->create_or_refresh_session;
+
+  $::form->read_cgi_input;
 
   eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return;
 
@@ -178,15 +195,12 @@ sub handle_request {
     $::form->{script} = "controller.pl";
   }
 
-  pre_request_checks();
-
   eval {
-    my $session_result = $::auth->restore_session;
-    $::auth->create_or_refresh_session;
+    pre_request_checks();
 
     $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin';
 
-    if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') {
+    if ($script eq 'login' or $script eq 'admin') {
       $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
       ::run($session_result);
 
@@ -200,12 +214,14 @@ sub handle_request {
 
       show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password});
 
-      $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password});
+      $::auth->store_credentials_in_session(login => $::form->{login}, password => $::form->{password});
       $::auth->create_or_refresh_session;
       $::auth->delete_session_value('FLASH');
       delete $::form->{password};
 
       if ($action) {
+        $::instance_conf->init;
+
         map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
           unless $action eq 'save' && $::form->{type} eq 'preferences';
 
@@ -223,21 +239,26 @@ sub handle_request {
     1;
   } or do {
     if ($EVAL_ERROR ne END_OF_REQUEST) {
+      print STDERR $EVAL_ERROR;
       $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
       eval { show_error('generic/error') };
     }
   };
 
   # cleanup
+  $::auth->save_session;
+  $::auth->expire_sessions;
+  $::auth->reset;
+
   $::locale   = undef;
   $::form     = undef;
-  $::auth     = undef;
   $::myconfig = ();
   Form::disconnect_standard_dbh;
-  $::auth->expire_session_keys->save_session;
-  $::auth->dbdisconnect;
 
   $::lxdebug->end_request;
+
+  $self->_watch_for_changed_files;
+
   $::lxdebug->leave_sub;
 }
 
@@ -313,31 +334,51 @@ sub _route_controller_request {
   return ($controller, $action);
 }
 
+sub _cache_file_modification_times {
+  my ($self) = @_;
+
+  return unless $self->_interface_is_fcgi && $::lx_office_conf{debug}->{restart_fcgi_process_on_changes};
+
+  require File::Find;
+  require POSIX;
+
+  my $wanted = sub {
+    return unless $File::Find::name =~ m/\.(?:pm|f?pl|html|conf|conf\.default)$/;
+    $fcgi_file_cache{ $File::Find::name } = (stat $File::Find::name)[9];
+  };
+
+  my $cwd = POSIX::getcwd();
+  File::Find::find($wanted, map { "${cwd}/${_}" } qw(config bin SL templates/webpages));
+  map { my $name = "${cwd}/${_}"; $fcgi_file_cache{$name} = (stat $name)[9] } qw(admin.pl dispatcher.fpl);
+}
+
+sub _watch_for_changed_files {
+  my ($self) = @_;
+
+  return unless $self->_interface_is_fcgi && $::lx_office_conf{debug}->{restart_fcgi_process_on_changes};
+
+  my $ok = all { (stat($_))[9] == $fcgi_file_cache{$_} } keys %fcgi_file_cache;
+  return if $ok;
+  $::lxdebug->message(LXDebug::DEBUG1(), "Program modifications detected. Restarting.");
+  exit;
+}
+
 sub get_standard_filehandles {
   my $self = shift;
 
   return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR);
 }
 
-sub _init_environment {
-  my %key_map = ( lib  => { name => 'PERL5LIB', append_path => 1 },
-                  path => { name => 'PATH',     append_path => 1 },
-                );
-  my $cfg     = $::lx_office_conf{environment} || {};
-
-  while (my ($key, $value) = each %{ $cfg }) {
-    next unless $value;
+sub _check_for_old_config_files {
+  my @old_files = grep { -f "config/${_}" } qw(authentication.pl console.conf lx-erp.conf lx-erp-local.conf);
+  return unless @old_files;
 
-    my $info = $key_map{$key} || {};
-    $key     = $info->{name}  || $key;
-
-    if ($info->{append_path}) {
-      $value = ':' . $value unless $value =~ m/^:/ || !$ENV{$key};
-      $value = $ENV{$key} . $value;
-    }
+  $::form->{title}      = $::locale->text('Old configuration files');
+  $::form->{stylesheet} = 'lx-office-erp.css';
+  $::form->header;
+  print $::form->parse_html_template('login/old_configuration_files', { FILES => \@old_files });
 
-    $ENV{$key} = $value;
-  }
+  ::end_of_request();
 }
 
 package main;