Formularfelder und Session-Keys für Logins umbenannt

[mfinanz.git] / SL / Dispatcher.pm

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 21398ccca72671947e279bd6a228a926b32c06d4..747da04854ede10bf7998bafb00b49fc14e76550 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -17,6 +17,7 @@ use List::MoreUtils qw(all);
 use List::Util qw(first);
 use POSIX;
 use SL::Auth;
 use List::Util qw(first);
 use POSIX;
 use SL::Auth;

+use SL::Dispatcher::AuthHandler;

 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;
 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;


@@ -37,6 +38,7 @@ sub new {
 
   my $self           = bless {}, $class;
   $self->{interface} = lc($interface || 'cgi');
 
   my $self           = bless {}, $class;
   $self->{interface} = lc($interface || 'cgi');

+  $self->{auth_handler} = SL::Dispatcher::AuthHandler->new;

 
   return $self;
 }
 
   return $self;
 }


@@ -63,6 +65,7 @@ sub show_error {
   $::lxdebug->enter_sub;
   my $template             = shift;
   my $error_type           = shift || '';
   $::lxdebug->enter_sub;
   my $template             = shift;
   my $error_type           = shift || '';

+  my %params               = @_;

 
   $::locale                = Locale->new($::lx_office_conf{system}->{language});
   $::form->{error}         = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session');
 
   $::locale                = Locale->new($::lx_office_conf{system}->{language});
   $::form->{error}         = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session');


@@ -70,7 +73,7 @@ sub show_error {
   $::myconfig{countrycode} = $::lx_office_conf{system}->{language};
 
   $::form->header;
   $::myconfig{countrycode} = $::lx_office_conf{system}->{language};
 
   $::form->header;

-  print $::form->parse_html_template($template);
+  print $::form->parse_html_template($template, \%params);

   $::lxdebug->leave_sub;
 
   ::end_of_request();
   $::lxdebug->leave_sub;
 
   ::end_of_request();


@@ -143,10 +146,11 @@ sub require_main_code {
 sub _require_controller {
   my $controller =  shift;
   $controller    =~ s|[^A-Za-z0-9_]||g;
 sub _require_controller {
   my $controller =  shift;
   $controller    =~ s|[^A-Za-z0-9_]||g;

+  $controller    =  "SL/Controller/${controller}";

 
   eval {
     package main;
 
   eval {
     package main;

-    require "SL/Controller/${controller}.pm";
+    require "${controller}.pm";

   } or die $EVAL_ERROR;
 }
 
   } or die $EVAL_ERROR;
 }
 


@@ -163,8 +167,6 @@ sub handle_request {
 
   my ($script, $path, $suffix, $script_name, $action, $routing_type);
 
 
   my ($script, $path, $suffix, $script_name, $action, $routing_type);
 

-  $script_name = $ENV{SCRIPT_NAME};
-

   $self->unrequire_bin_mozilla;
 
   $::locale        = Locale->new($::lx_office_conf{system}->{language});
   $self->unrequire_bin_mozilla;
 
   $::locale        = Locale->new($::lx_office_conf{system}->{language});


@@ -177,7 +179,7 @@ sub handle_request {
 
   $::form->read_cgi_input;
 
 
   $::form->read_cgi_input;
 

-  eval { ($routing_type, $script_name, $action) = _route_request($script_name); 1; } or return;
+  eval { ($routing_type, $script_name, $action) = _route_request($ENV{SCRIPT_NAME}); 1; } or return;

 
   if ($routing_type eq 'old') {
     $::form->{action}  =  lc $::form->{action};
 
   if ($routing_type eq 'old') {
     $::form->{action}  =  lc $::form->{action};


@@ -205,23 +207,17 @@ sub handle_request {
     } else {
       show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
 
     } else {
       show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
 

-      my $login = $::auth->get_session_value('login');
-      show_error('login/password_error', 'password') if not defined $login;
-
-      %::myconfig = $::auth->read_user(login => $login);
-
-      show_error('login/password_error', 'password') unless $::myconfig{login};
-
-      $::locale = Locale->new($::myconfig{countrycode});
-
-      show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($login, undef);
+      my $auth_level = $self->{auth_handler}->handle(
+        routing_type => $routing_type,
+        script       => $script,
+        controller   => $script_name,
+        action       => $action,
+      );

 
 

-      $::auth->create_or_refresh_session;
-      $::auth->delete_session_value('FLASH');
-      delete $::form->{password};
+      delete @{ $::form }{ grep { m/^\{AUTH\}/ } keys %{ $::form } };

 
       if ($action) {
 
       if ($action) {

-        $::instance_conf->init;
+        $::instance_conf->init if $auth_level eq 'user';

 
         map { $::form->{$_} = $::myconfig{$_} } qw(charset)
           unless $action eq 'save' && $::form->{type} eq 'preferences';
 
         map { $::form->{$_} = $::myconfig{$_} } qw(charset)
           unless $action eq 'save' && $::form->{type} eq 'preferences';