X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FLoginScreen.pm;h=1590e614dcba913312e38e71dee1d42f9311289e;hb=6f90b1ba5d1301194ad12591a000794acd89449b;hp=adf8b471c0057a72a8f4ddb8d96f3d1800160c9b;hpb=ce651068ffd6d20ef408dbc45d8a04a69a3dc3ed;p=kivitendo-erp.git

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index adf8b471c..1590e614d 100644
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -56,7 +56,6 @@ sub action_login {
   }
 
   %::myconfig      = $login ? $::auth->read_user(login => $login) : ();
-  $::form->{login} = $login;
   $::locale        = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
   SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
 
@@ -68,7 +67,8 @@ sub action_login {
   # Auth DB needs update? If so log the user out forcefully.
   if (User::LOGIN_AUTH_DBUPDATE_AVAILABLE() == $result) {
     $::auth->destroy_session;
-    return $self->render('login_screen/auth_db_needs_update');
+    # must be without layout because menu rights might not exist yet
+    return $self->render('login_screen/auth_db_needs_update', { layout => 0 });
   }
 
   # Basic client tables available? If not tell the user to create them
@@ -79,7 +79,7 @@ sub action_login {
   }
 
   # Database update available?
-  ::end_of_request() if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
+  $::dispatcher->end_request if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
 
   # Other login errors.
   if (User::LOGIN_OK() != $result) {
@@ -155,6 +155,7 @@ sub error_state {
   my %states = (
     session  => { warning => t8('The session has expired. Please log in again.')                   },
     password => { error   => t8('Incorrect username or password or no access to selected client!') },
+    action   => { warning => t8('The action is missing or invalid.')                               },
   );
 
   return %{ $states{$_[0]} || {} };