X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FLoginScreen.pm;h=80700b930895706d3fb5732a2f2fa2f8d93d27f7;hb=91a56629c620e0e0a2ea50a93f005bc344b1eca8;hp=e84a31505ddb1b1cf80b12a0a3c1bbee6228283d;hpb=6ac47be4e3e318ea212ca595195b0b55a9c386a3;p=kivitendo-erp.git diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm index e84a31505..80700b930 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}); @@ -111,8 +110,6 @@ sub keep_auth_vars_in_form { sub _redirect_to_main_script { my ($self) = @_; - $self->_ensure_employees_for_authorized_users_exist; - return $self->redirect_to($::form->{callback}) if $::form->{callback}; $self->redirect_to(controller => "login.pl", action => 'company_logo'); @@ -153,27 +150,11 @@ sub _redirect_to_main_script_if_already_logged_in { return 1; } -sub _ensure_employees_for_authorized_users_exist { - my ($self) = @_; - - my %employees_by_login = map { ($_->login => $_) } @{ SL::DB::Manager::Employee->get_all }; - - foreach my $user (@{ SL::DB::AuthClient->new(id => $::auth->client->{id})->load->users || [] }) { - my $user_config = $user->config_values; - my $employee = $employees_by_login{$user->login} || SL::DB::Employee->new(login => $user->login); - - $employee->update_attributes( - name => $user_config->{name}, - workphone => $user_config->{tel}, - deleted => 0, - ); - } -} - 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]} || {} };