Bei Loginfehlern das Menü nicht mitrendern

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index aace43a192901305cc77d6122324ce8c9aad4c21..c15cf3ea8f9d4b8c3e1a0d9d8e7c848cc4aaef0a 100644 (file)
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -19,7 +19,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 });
+  $self->render('login_screen/user_login', { no_menu => 1 }, error => error_state($::form->{error}));

 }
 
 sub action_logout {
 }
 
 sub action_logout {


@@ -108,4 +108,11 @@ sub _redirect_to_main_script_if_already_logged_in {
   return 1;
 }
 
   return 1;
 }
 

+sub error_state {
+  return {
+    session  => $::locale->text('The session is invalid or has expired.'),
+    password => $::locale->text('Incorrect password!'),
+  }->{$_[0]};
+}
+

 1;
 1;

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 43bf6680b98c38dd1f50b9dd5672efb4fe5b4362..c67efa79a138b073c6dfa5d77246669777a7831e 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -81,7 +81,7 @@ 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');
 
   $::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');
 

-  $::form->header;
+  $::form->header(no_menu => 1);

   print $::form->parse_html_template($template, \%params);
   $::lxdebug->leave_sub;
 
   print $::form->parse_html_template($template, \%params);
   $::lxdebug->leave_sub;
 


@@ -225,7 +225,9 @@ sub handle_request {
       ::run($session_result);
 
     } else {
       ::run($session_result);
 
     } else {

-      show_error('login_screen/user_login', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
+      if (SL::Auth::SESSION_EXPIRED == $session_result) {
+        print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login&error=session');
+      }

 
       my %auth_result = $self->{auth_handler}->handle(
         routing_type => $routing_type,
 
       my %auth_result = $self->{auth_handler}->handle(
         routing_type => $routing_type,

diff --git a/SL/Dispatcher/AuthHandler/User.pm b/SL/Dispatcher/AuthHandler/User.pm
index 150245c587898fd742166dfd39ecc61552f891d5..a1b64860a615612906c7865b86bc4d95b431ce65 100644 (file)
--- a/SL/Dispatcher/AuthHandler/User.pm
+++ b/SL/Dispatcher/AuthHandler/User.pm
@@ -31,7 +31,7 @@ sub _error {
   my $self = shift;
 
   $::auth->punish_wrong_login;
   my $self = shift;
 
   $::auth->punish_wrong_login;

-  SL::Dispatcher::show_error('login_screen/user_login', 'password', @_);
+  print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login&error=password');

 }
 
 1;
 }
 
 1;