flash_later(): In Session gespeicherter Flash für nächsten Request implementiert

[kivitendo-erp.git] / SL / Dispatcher.pm

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 8bd2968..013dfe6 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -149,16 +149,16 @@ sub handle_request {
   pre_request_checks();
 
   eval {
+    my $session_result = $::auth->restore_session;
+    $::auth->create_or_refresh_session;
+
     $::form->error($::locale->text('System currently down for maintenance!')) if -e "$::userspath/nologin" && $script ne 'admin';
 
     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 ($action) {
-      # copy from am.pl routines
-      my $session_result = $::auth->restore_session;
+      ::run($session_result);
 
+    } else {
       show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
       %::myconfig = $::auth->read_user($::form->{login});
 
@@ -170,16 +170,18 @@ sub handle_request {
 
       $::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 $action eq 'save' && $::form->{type} eq 'preferences';
+      if ($action) {
+        map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
+          unless $action eq 'save' && $::form->{type} eq 'preferences';
 
-      $::form->set_standard_title;
-      ::call_sub('::' . $::locale->findsub($action));
-
-    } else {
-      $::form->error($::locale->text('action= not defined!'));
+        $::form->set_standard_title;
+        ::call_sub('::' . $::locale->findsub($action));
+      } else {
+        $::form->error($::locale->text('action= not defined!'));
+      }
     }
 
     1;