Währung beim CSV-Import Kunden/Lieferanten unterstützen

[mfinanz.git] / SL / Controller / LoginScreen.pm

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index 89f21ccfadd169c0c12ed022f0057bc581f99848..13b7b8a8c9d2e4f3eb755f45eb295b9686fb0f8b 100644 (file)
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -20,7 +20,7 @@ sub action_user_login {
   return if $self->_redirect_to_main_script_if_already_logged_in;
 
   # Otherwise show the login form.
   return if $self->_redirect_to_main_script_if_already_logged_in;
 
   # Otherwise show the login form.

-  $self->render('login_screen/user_login', { no_menu => 1 }, error => error_state($::form->{error}));
+  $self->render('login_screen/user_login', error => error_state($::form->{error}));

 }
 
 sub action_logout {
 }
 
 sub action_logout {


@@ -28,14 +28,15 @@ sub action_logout {
 
   $::auth->destroy_session;
   $::auth->create_or_refresh_session;
 
   $::auth->destroy_session;
   $::auth->create_or_refresh_session;

-  $self->render('login_screen/user_login', { no_menu => 1 }, error => $::locale->text('You are logged out!'));
+  $self->render('login_screen/user_login', error => $::locale->text('You are logged out!'));

 }
 
 sub action_login {
   my ($self) = @_;
 
 }
 
 sub action_login {
   my ($self) = @_;
 

-  %::myconfig      = $::form->{'{AUTH}login'} ? $::auth->read_user(login => $::form->{'{AUTH}login'}) : ();
-  %::myconfig      = SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
+  my $login        = $::form->{'{AUTH}login'} || $::auth->get_session_value('login');
+  %::myconfig      = $login ? $::auth->read_user(login => $login) : ();
+  SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});

   $::form->{login} = $::myconfig{login};
   $::locale        = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
   my $user         = User->new(login => $::myconfig{login});
   $::form->{login} = $::myconfig{login};
   $::locale        = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
   my $user         = User->new(login => $::myconfig{login});


@@ -56,7 +57,7 @@ sub action_login {
   # Other login errors.
   if (0 > $result) {
     $::auth->punish_wrong_login;
   # Other login errors.
   if (0 > $result) {
     $::auth->punish_wrong_login;

-    return $self->render('login_screen/user_login', { no_menu => 1 }, error => $::locale->text('Incorrect username or password!'));
+    return $self->render('login_screen/user_login', error => $::locale->text('Incorrect username or password!'));

   }
 
   # Everything is fine.
   }
 
   # Everything is fine.