X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=cc886d8ca70ae19949ee4b6cfb70f6d5af5c58f6;hb=ae45c5b76d87727e7113d7163e34a9f6444247e8;hp=532592e664a161d81c1640b597a45ccaf9c671f6;hpb=b2945bf61775161f9ce9be9bdbd106ad44247a14;p=kivitendo-erp.git

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 532592e66..cc886d8ca 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -2,6 +2,12 @@ package SL::Dispatcher;
 
 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 CGI qw( -no_xhtml);
 use English qw(-no_match_vars);
 use SL::Auth;
@@ -9,9 +15,7 @@ use SL::LXDebug;
 use SL::Locale;
 use SL::Common;
 use Form;
-use Moose;
-use Rose::DB;
-use Rose::DB::Object;
+use List::Util qw(first);
 use File::Basename;
 
 # Trailing new line is added so that Perl will not add the line
@@ -19,17 +23,25 @@ use File::Basename;
 use constant END_OF_REQUEST => "END-OF-REQUEST\n";
 
 sub pre_request_checks {
-  show_error('login/auth_db_unreachable') unless $::auth->session_tables_present;
+  if (!$::auth->session_tables_present) {
+    if ($::form->{script} eq 'admin.pl') {
+      ::run();
+      ::end_of_request();
+    } else {
+      show_error('login/auth_db_unreachable');
+    }
+  }
   $::auth->expire_sessions;
 }
 
 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');
+  my $template             = shift;
+  my $error_type           = shift || '';
+
+  $::locale                = Locale->new($::language);
+  $::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';
 
@@ -56,16 +68,23 @@ sub pre_startup_setup {
     require "bin/mozilla/installationcheck.pl";
   } or die $EVAL_ERROR;
 
-  # dummy globals
+  # canonial globals. if it's not here, chances are it will get refactored someday.
   {
     no warnings 'once';
-    $::userspath  = "users";
-    $::templates  = "templates";
-    $::memberfile = "users/members";
-    $::sendmail   = "| /usr/sbin/sendmail -t";
-    $::lxdebug    = LXDebug->new;
-    $::auth       = SL::Auth->new;
-    %::myconfig   = ();
+    $::userspath   = "users";
+    $::templates   = "templates";
+    $::memberfile  = "users/members";
+    $::menufile    = "menu.ini";
+    $::sendmail    = "| /usr/sbin/sendmail -t";
+    $::lxdebug     = LXDebug->new;
+    $::auth        = SL::Auth->new;
+    $::form        = undef;
+    %::myconfig    = ();
+    %::called_subs = (); # currently used for recursion detection
+  }
+
+  $SIG{__WARN__} = sub {
+    $::lxdebug->warn(@_);
   }
 }
 
@@ -79,6 +98,7 @@ sub pre_startup {
 }
 
 sub require_main_code {
+  $::lxdebug->enter_sub;
   my ($script, $suffix) = @_;
 
   eval {
@@ -93,13 +113,28 @@ sub require_main_code {
     };
     $::form->error($EVAL_ERROR) if ($EVAL_ERROR);
   }
-  if ($::form->{login} && -f "bin/mozilla/$::form->{login}_$::form->{script}") {
+  if ($::form->{login} && -f "bin/mozilla/$::form->{login}_$script") {
     eval {
       package main;
-      require "bin/mozilla/$::form->{login}_$::form->{script}";
+      require "bin/mozilla/$::form->{login}_$script";
     };
     $::form->error($EVAL_ERROR) if ($EVAL_ERROR);
   }
+  $::lxdebug->leave_sub;
+}
+
+sub _require_controller {
+  my $controller =  shift;
+  $controller    =~ s|[^A-Za-z0-9_]||g;
+
+  eval {
+    package main;
+    require "SL/Controller/${controller}.pm";
+  } or die $EVAL_ERROR;
+}
+
+sub _run_controller {
+  "SL::Controller::$_[0]"->new->_run_action($_[1]);
 }
 
 sub handle_request {
@@ -107,58 +142,73 @@ sub handle_request {
   $::lxdebug->begin_request;
 
   my $interface = lc(shift || 'cgi');
-  my $script_name;
+  my ($script, $path, $suffix, $script_name, $action, $routing_type);
 
-  if ($interface =~ m/^(?:fastcgi|fcgid|fcgi)$/) {
-    $script_name = $ENV{SCRIPT_NAME};
-    unrequire_bin_mozilla();
+  $script_name = $ENV{SCRIPT_NAME};
 
-  } else {
-    $script_name = $0;
-  }
+  unrequire_bin_mozilla($interface);
 
-  my ($script, $path, $suffix) = fileparse($script_name, ".pl");
-  require_main_code($script, $suffix);
+  $::cgi         = CGI->new('');
+  $::locale      = Locale->new($::language);
+  $::form        = Form->new;
+  %::called_subs = ();
 
-  $::cgi            = CGI->new('');
-  $::locale         = Locale->new($::language, $script);
-  $::form           = Form->new;
-  $::form->{script} = $script . $suffix;
+  eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return;
+
+  if ($routing_type eq 'old') {
+    $::form->{action}  =  lc $::form->{action};
+    $::form->{action}  =~ s/( |-|,|\#)/_/g;
+
+   ($script, $path, $suffix) = fileparse($script_name, ".pl");
+    require_main_code($script, $suffix);
+
+    $::form->{script} = $script . $suffix;
+
+  } else {
+    _require_controller($script_name);
+    $::form->{script} = "controller.pl";
+  }
 
   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);
+    my $session_result = $::auth->restore_session;
+    $::auth->create_or_refresh_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';
+    $::form->error($::locale->text('System currently down for maintenance!')) if -e "$::userspath/nologin" && $script ne 'admin';
 
-      my $session_result = $::auth->restore_session;
+    if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') {
+      $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
+      ::run($session_result);
 
+    } else {
       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);
+      $::locale = Locale->new($::myconfig{countrycode});
 
       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;
+      $::auth->delete_session_value('FLASH')->save_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!'));
+      if ($action) {
+        map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
+          unless $action eq 'save' && $::form->{type} eq 'preferences';
+
+        $::form->set_standard_title;
+        if ($routing_type eq 'old') {
+          ::call_sub('::' . $::locale->findsub($action));
+        } else {
+          _run_controller($script_name, $action);
+        }
+      } else {
+        $::form->error($::locale->text('action= not defined!'));
+      }
     }
 
     1;
@@ -173,12 +223,15 @@ sub handle_request {
   $::locale   = undef;
   $::form     = undef;
   $::myconfig = ();
+  Form::disconnect_standard_dbh();
 
   $::lxdebug->end_request;
   $::lxdebug->leave_sub;
 }
 
 sub unrequire_bin_mozilla {
+  return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/;
+
   for (keys %INC) {
     next unless m#^bin/mozilla/#;
     next if /\bcommon.pl$/;
@@ -187,6 +240,61 @@ sub unrequire_bin_mozilla {
   }
 }
 
+sub _route_request {
+  my $script_name = shift;
+
+  return $script_name =~ m/dispatcher\.pl$/ ? ('old',        _route_dispatcher_request())
+       : $script_name =~ m/controller\.pl/  ? ('controller', _route_controller_request())
+       :                                      ('old',        $script_name, $::form->{action});
+}
+
+sub _route_dispatcher_request {
+  my $name_re = qr{[a-z]\w*};
+  my ($script_name, $action);
+
+  eval {
+    die "Unroutable request -- inavlid module name.\n" if !$::form->{M} || ($::form->{M} !~ m/^${name_re}$/);
+    $script_name = $::form->{M} . '.pl';
+
+    if ($::form->{A}) {
+      $action = $::form->{A};
+
+    } else {
+      $action = first { m/^A_${name_re}$/ } keys %{ $::form };
+      die "Unroutable request -- inavlid action name.\n" if !$action;
+
+      delete $::form->{$action};
+      $action = substr $action, 2;
+    }
+
+    delete @{$::form}{qw(M A)};
+
+    1;
+  } or do {
+    $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+    show_error('generic/error');
+  };
+
+  return ($script_name, $action);
+}
+
+sub _route_controller_request {
+  my ($controller, $action);
+
+  eval {
+    $::form->{action}      =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) $|x || die "Unroutable request -- inavlid controller/action.\n";
+    ($controller, $action) =  ($1, $2);
+    delete $::form->{action};
+
+    1;
+  } or do {
+    $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+    show_error('generic/error');
+  };
+
+  return ($controller, $action);
+}
+
 package main;
 
 use strict;