Test updated

[mfinanz.git] / dispatcher.fpl

diff --git a/dispatcher.fpl b/dispatcher.fpl
index 60697200dbd95746616e26d7abff7e131dce7f16..9b7c98b7d1302088ed1f4ea6f35a9fdf88ee477f 100755 (executable)
--- a/dispatcher.fpl
+++ b/dispatcher.fpl
@@ -3,162 +3,21 @@
 use strict;
 
 BEGIN {
 use strict;
 
 BEGIN {

-  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
-  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
-  push    @INC, "SL";               # FCGI won't find modules that are not properly named. Help it by inclduging SL
-}
-
-use FCGI;
-use CGI qw( -no_xhtml);
-use SL::Auth;
-use SL::LXDebug;
-use SL::Locale;
-use SL::Common;
-use Form;
-use Moose;
-use Rose::DB;
-use Rose::DB::Object;
-use File::Basename;
-
-
-eval { require "config/lx-erp.conf"; };
-eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf";
-require "bin/mozilla/common.pl";
-require "bin/mozilla/installationcheck.pl";
-
-# dummy globals
-{
-  no warnings 'once';
-  $::userspath  = "users";
-  $::templates  = "templates";
-  $::memberfile = "users/members";
-  $::sendmail   = "| /usr/sbin/sendmail -t";
-  $::lxdebug    = LXDebug->new;
-  $::auth       = SL::Auth->new;
-  %::myconfig   = ();
-}
-
-_pre_startup_checks();
-
-my $request                  = FCGI::Request();
-#if ($request->IsFastCGI) {
-  handle_request() while $request->Accept() >= 0;
-#} else {
-#  handle_request();
-#}
-
-# end
-
-sub handle_request {
-  $::lxdebug->enter_sub;
-  $::lxdebug->begin_request;
-
-  my ($script, $path, $suffix) = fileparse($ENV{SCRIPT_NAME}, ".pl");
-  unrequire_bin_mozilla();
-  require_main_code($script, $suffix);
-
-  $::cgi            = CGI->new('');
-  $::locale         = Locale->new($::language, $script);
-  $::form           = Form->new;
-  $::form->{script} = $script . $suffix;
-
-  _pre_request_checks();
-
-  eval {
-    if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') {
-      $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
-      run($::auth->restore_session);
-    } elsif ($::form->{action}) {
-      # copy from am.pl routines
-      $::form->error($::locale->text('System currently down for maintenance!')) if -e "$main::userspath/nologin" && $script ne 'admin';
-
-      my $session_result = $::auth->restore_session;
-
-      _show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
-      %::myconfig = $::auth->read_user($::form->{login});
-
-      _show_error('login/password_error', 'password') unless $::myconfig{login};
-
-      $::locale = Locale->new($::myconfig{countrycode}, $script);
+  use FindBin;

 
 

-      _show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}, 0);
-
-      $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password});
-      $::auth->create_or_refresh_session;
-      delete $::form->{password};
-
-      map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
-        unless $::form->{action} eq 'save' && $::form->{type} eq 'preferences';
-
-      $::form->set_standard_title;
-      call_sub($::locale->findsub($::form->{action}));
-    } else {
-      $::form->error($::locale->text('action= not defined!'));
-    }
-
-    1;
-  } or do {
-    $::form->{label_error} = $::cgi->pre($@);
-    _show_error('generic/error');
-  };
-
-  # cleanup
-  $::locale   = undef;
-  $::form     = undef;
-  $::myconfig = ();
-
-  $::lxdebug->end_request;
-  $::lxdebug->leave_sub;
-}
-
-sub _pre_request_checks {
-  _show_error('login/auth_db_unreachable') unless $::auth->session_tables_present;
-  $::auth->expire_sessions;
+  unshift(@INC, $FindBin::Bin . '/modules/override'); # Use our own versions of various modules (e.g. YAML).
+  push   (@INC, $FindBin::Bin);                       # '.' will be removed from @INC soon.
+  push   (@INC, $FindBin::Bin . '/modules/fallback'); # Only use our own versions of modules if there's no system version.

 }
 
 }
 

-sub _show_error {
-  $::lxdebug->enter_sub;
-  my $template           = shift;
-  my $error_type         = shift;
-  my $locale             = Locale->new($::language, 'all');
-  $::form->{error}       = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session');
-  $::form->{error}       = $::locale->text('Incorrect password!.')                   if ($error_type eq 'password');
-  $::myconfig{countrycode} = $::language;
-  $::form->{stylesheet}    = 'css/lx-office-erp.css';
-
-  $::form->header;
-  print $::form->parse_html_template($template);
-  $::lxdebug->leave_sub;
-
-  exit;
-}
-
-sub _pre_startup_checks {
-  verify_installation();
-}
-
-sub unrequire_bin_mozilla {
-  for (keys %INC) {
-   next unless m#^bin/mozilla/#;
-    next if /\bcommon.pl$/;
-    next if /\binstallationcheck.pl$/;
-    delete $INC{$_};
-  }
-}
-
-sub require_main_code {
-  my ($script, $suffix) = @_;
-
-  require "bin/mozilla/$script$suffix";
+use SL::Dispatcher;
+use SL::FCGIFixes;
+use SL::LXDebug;

 
 

-  if (-f "bin/mozilla/custom_$script$suffix") {
-    eval { require "bin/mozilla/custom_$script$suffix"; };
-    $::form->error($@) if ($@);
-  }
-  if ($::form->{login} && -f "bin/mozilla/$::form->{login}_$::form->{script}") {
-    eval { require "bin/mozilla/$::form->{login}_$::form->{script}"; };
-    $::form->error($@) if ($@);
-  }
-}
+our $dispatcher = SL::Dispatcher->new('FastCGI');
+$dispatcher->pre_startup_setup;
+SL::FCGIFixes::apply_fixes();
+$dispatcher->pre_startup_checks;
+$dispatcher->handle_all_requests;

 
 1;
 
 1;