select_item() in io.pl auf Template umgestellt

[mfinanz.git] / SL / Dispatcher.pm

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 909433ebdbde14b2d67d7ad410081fdb454ad21d..239cdcb96de690bdbf75a60fd3ba997248a02f81 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -19,6 +19,7 @@ use SL::Locale;
 use SL::Common;
 use SL::Form;
 use SL::Helper::DateTime;
 use SL::Common;
 use SL::Form;
 use SL::Helper::DateTime;

+use SL::Template::Plugin::HTMLFixes;

 use List::Util qw(first);
 use File::Basename;
 
 use List::Util qw(first);
 use File::Basename;
 


@@ -51,7 +52,6 @@ sub pre_request_checks {
       show_error('login/auth_db_unreachable');
     }
   }
       show_error('login/auth_db_unreachable');
     }
   }

-  $::auth->expire_sessions;

 }
 
 sub show_error {
 }
 
 sub show_error {


@@ -180,15 +180,15 @@ sub handle_request {
     $::form->{script} = "controller.pl";
   }
 
     $::form->{script} = "controller.pl";
   }
 

-  pre_request_checks();
-

   eval {
   eval {

+    pre_request_checks();
+

     my $session_result = $::auth->restore_session;
     $::auth->create_or_refresh_session;
 
     $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin';
 
     my $session_result = $::auth->restore_session;
     $::auth->create_or_refresh_session;
 
     $::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);
 
       $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
       ::run($session_result);
 


@@ -202,7 +202,7 @@ sub handle_request {
 
       show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password});
 
 
       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};
       $::auth->create_or_refresh_session;
       $::auth->delete_session_value('FLASH');
       delete $::form->{password};


@@ -231,12 +231,14 @@ sub handle_request {
   };
 
   # cleanup
   };
 
   # cleanup

+  $::auth->expire_session_keys->save_session;
+  $::auth->expire_sessions;
+  $::auth->reset;
+

   $::locale   = undef;
   $::form     = undef;
   $::myconfig = ();
   Form::disconnect_standard_dbh;
   $::locale   = undef;
   $::form     = undef;
   $::myconfig = ();
   Form::disconnect_standard_dbh;

-  $::auth->expire_session_keys->save_session;
-  $::auth->reset;

 
   $::lxdebug->end_request;
   $::lxdebug->leave_sub;
 
   $::lxdebug->end_request;
   $::lxdebug->leave_sub;