X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/5494f687372570c9d1c5eb5c6aad73767e50820a..eb8ba4764dff48ed8e67a00c48d02c9e7c6e5de5:/SL/Dispatcher.pm?ds=sidebyside

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index e9f7dac09..21398ccca 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -68,7 +68,6 @@ sub show_error {
   $::form->{error}         = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session');
   $::form->{error}         = $::locale->text('Incorrect password!.')                   if ($error_type eq 'password');
   $::myconfig{countrycode} = $::lx_office_conf{system}->{language};
-  $::form->{stylesheet}    = 'css/lx-office-erp.css';
 
   $::form->header;
   print $::form->parse_html_template($template);
@@ -205,15 +204,18 @@ sub handle_request {
 
     } else {
       show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
-      %::myconfig = $::auth->read_user($::form->{login});
+
+      my $login = $::auth->get_session_value('login');
+      show_error('login/password_error', 'password') if not defined $login;
+
+      %::myconfig = $::auth->read_user(login => $login);
 
       show_error('login/password_error', 'password') unless $::myconfig{login};
 
       $::locale = Locale->new($::myconfig{countrycode});
 
-      show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password});
+      show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($login, undef);
 
-      $::auth->store_credentials_in_session(login => $::form->{login}, password => $::form->{password});
       $::auth->create_or_refresh_session;
       $::auth->delete_session_value('FLASH');
       delete $::form->{password};
@@ -221,7 +223,7 @@ sub handle_request {
       if ($action) {
         $::instance_conf->init;
 
-        map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
+        map { $::form->{$_} = $::myconfig{$_} } qw(charset)
           unless $action eq 'save' && $::form->{type} eq 'preferences';
 
         $::form->set_standard_title;
@@ -374,7 +376,6 @@ sub _check_for_old_config_files {
   return unless @old_files;
 
   $::form->{title}      = $::locale->text('Old configuration files');
-  $::form->{stylesheet} = 'lx-office-erp.css';
   $::form->header;
   print $::form->parse_html_template('login/old_configuration_files', { FILES => \@old_files });