X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/3772d03ab5a1d64173504ca61bf737dfcd451a92..66c08b6472a2467444192dbfed35e9f30f7c910d:/SL/Controller/LoginScreen.pm?ds=sidebyside

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index 6c31a9055..e64ad0c78 100644
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -10,6 +10,7 @@ use SL::Dispatcher::AuthHandler::User;
 use SL::DB::AuthClient;
 use SL::DB::AuthGroup;
 use SL::DB::AuthUser;
+use SL::Locale::String qw(t8);
 use SL::User;
 
 use Rose::Object::MakeMethods::Generic (
@@ -30,7 +31,7 @@ sub action_user_login {
   return if $self->_redirect_to_main_script_if_already_logged_in;
 
   # Otherwise show the login form.
-  $self->render('login_screen/user_login', error => error_state($::form->{error}));
+  $self->show_login_form(error => error_state($::form->{error}));
 }
 
 sub action_logout {
@@ -38,22 +39,30 @@ sub action_logout {
 
   $::auth->destroy_session;
   $::auth->create_or_refresh_session;
-  $self->render('login_screen/user_login', error => $::locale->text('You are logged out!'));
+  $self->show_login_form(info => $::locale->text('You are logged out!'));
 }
 
 sub action_login {
   my ($self) = @_;
 
-  my $login        = $::form->{'{AUTH}login'} || $::auth->get_session_value('login');
+  my $login     = $::form->{'{AUTH}login'}     || $::auth->get_session_value('login');
+  my $client_id = $::form->{'{AUTH}client_id'} || $::auth->get_session_value('client_id');
+  my $error     = t8('Incorrect username or password or no access to selected client!');
+
+  if (!$::auth->set_client($client_id)) {
+    $::auth->punish_wrong_login;
+    return $self->show_login_form(error => $error);
+  }
+
   %::myconfig      = $login ? $::auth->read_user(login => $login) : ();
-  SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
-  $::form->{login} = $::myconfig{login};
+  $::form->{login} = $login;
   $::locale        = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
-  my $user         = User->new(login => $::myconfig{login});
-  $::request->{layout} = SL::Layout::Dispatcher->new(style => $user->{menustyle});
+  SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
+
+  $::request->layout(SL::Layout::Dispatcher->new(style => $::myconfig{menustyle}));
 
   # if we get an error back, bale out
-  my $result = $user->login($::form);
+  my $result = User->new(login => $::myconfig{login})->login($::form);
 
   # Database update available?
   ::end_of_request() if -2 == $result;
@@ -67,13 +76,16 @@ sub action_login {
   # Other login errors.
   if (0 > $result) {
     $::auth->punish_wrong_login;
-    return $self->render('login_screen/user_login', error => $::locale->text('Incorrect username or password!'));
+    return $self->show_login_form(error => $error);
   }
 
   # Everything is fine.
   $::auth->set_cookie_environment_variable();
 
-  $self->_redirect_to_main_script($user);
+  # TODO: Employees anlegen/checken
+  # $self->_ensure_employees_for_authorized_users_exist;
+
+  $self->_redirect_to_main_script;
 }
 
 #
@@ -92,7 +104,7 @@ sub keep_auth_vars_in_form {
 #
 
 sub _redirect_to_main_script {
-  my ($self, $user) = @_;
+  my ($self) = @_;
 
   return $self->redirect_to($::form->{callback}) if $::form->{callback};
 
@@ -124,7 +136,7 @@ sub _redirect_to_main_script_if_already_logged_in {
 sub error_state {
   return {
     session  => $::locale->text('The session is invalid or has expired.'),
-    password => $::locale->text('Incorrect password!'),
+    password => $::locale->text('Incorrect username or password or no access to selected client!'),
   }->{$_[0]};
 }
 
@@ -142,4 +154,11 @@ sub init_default_client_id {
   return $default_client ? $default_client->id : undef;
 }
 
+sub show_login_form {
+  my ($self, %params) = @_;
+
+  $::request->layout->focus('#auth_login');
+  $self->render('login_screen/user_login', %params);
+}
+
 1;