Spool-Dateien: Handling vom wiederholten Spoolen desselben Beleges gefixt

[kivitendo-erp.git] / SL / Dispatcher / AuthHandler / Admin.pm

diff --git a/SL/Dispatcher/AuthHandler/Admin.pm b/SL/Dispatcher/AuthHandler/Admin.pm
index 7b194ff..2e41ee9 100644 (file)
--- a/SL/Dispatcher/AuthHandler/Admin.pm
+++ b/SL/Dispatcher/AuthHandler/Admin.pm
@@ -1,16 +1,21 @@
 package SL::Dispatcher::AuthHandler::Admin;
 
 use strict;
-
 use parent qw(Rose::Object);
 
+use SL::Layout::Dispatcher;
+
 sub handle {
   %::myconfig = ();
 
-  return if $::auth->authenticate_root($::auth->get_session_value('admin_password')) == $::auth->OK();
+  return if  $::form->{'{AUTH}admin_password'} && ($::auth->authenticate_root($::form->{'{AUTH}admin_password'})            == $::auth->OK());
+  return if !$::form->{'{AUTH}admin_password'} && ($::auth->authenticate_root($::auth->get_session_value('admin_password')) == $::auth->OK());
+
+  $::request->{layout} = SL::Layout::Dispatcher->new(style => 'admin');
 
+  $::auth->punish_wrong_login;
   $::auth->delete_session_value('admin_password');
-  SL::Dispatcher::show_error('login/password_error', 'password', is_admin => 1);
+  SL::Dispatcher::show_error('admin/adminlogin', 'password');
 }
 
 1;