X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FLoginScreen.pm;h=adcc8f05b9fede9b16b557191eb48af4e7963531;hb=713de5ed35a8a1faea940354254c4e781631c495;hp=d38736b82289fb884124556e9cb54d52918ddb8c;hpb=fa7fc7eeb3ca718914affee06c0629a08d571288;p=kivitendo-erp.git

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index d38736b82..adcc8f05b 100644
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -13,6 +13,7 @@ use SL::DB::AuthUser;
 use SL::DB::Employee;
 use SL::Locale::String qw(t8);
 use SL::User;
+use SL::Version;
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => [ qw(clients default_client_id) ],
@@ -56,9 +57,10 @@ 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});
+  my $auth_result  = SL::Dispatcher::AuthHandler::User->new->handle(callback => $::form->{callback});
+
+  $::dispatcher->end_request unless $auth_result;
 
   $::request->layout(SL::Layout::Dispatcher->new(style => $::myconfig{menustyle}));
 
@@ -68,7 +70,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 +82,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) {
@@ -162,7 +165,9 @@ sub error_state {
 }
 
 sub set_layout {
-  $::request->{layout} = SL::Layout::Dispatcher->new(style => 'login');
+  $::request->{layout} = $::request->is_mobile
+    ? SL::Layout::Dispatcher->new(style => 'mobile_login')
+    : SL::Layout::Dispatcher->new(style => 'login');
 }
 
 sub init_clients {
@@ -178,7 +183,7 @@ sub init_default_client_id {
 sub show_login_form {
   my ($self, %params) = @_;
 
-  $self->render('login_screen/user_login', %params, version => $::form->read_version);
+  $self->render('login_screen/user_login', %params, version => SL::Version->get_version, callback => $::form->{callback});
 }
 
 1;