Refactoring: Parameterredesign SL::Controller::Base::render und SL::Presenter::render

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

diff --git a/SL/Dispatcher/AuthHandler/Admin.pm b/SL/Dispatcher/AuthHandler/Admin.pm
index 5a92015f545129d4c81c14ad6f1984800ea98300..a7b649cf2bc6d77755063bc792cfa1f1523933d6 100644 (file)
--- a/SL/Dispatcher/AuthHandler/Admin.pm
+++ b/SL/Dispatcher/AuthHandler/Admin.pm
@@ -1,16 +1,24 @@
 package SL::Dispatcher::AuthHandler::Admin;
 
 use strict;
 package SL::Dispatcher::AuthHandler::Admin;
 
 use strict;

-

 use parent qw(Rose::Object);
 
 use parent qw(Rose::Object);
 

+use SL::Layout::Dispatcher;
+

 sub handle {
   %::myconfig = ();
 
 sub handle {
   %::myconfig = ();
 

-  return if $::auth->authenticate_root($::auth->get_session_value('rpw')) == $::auth->OK();
+  return 1 if  $::auth->get_api_token_cookie;
+  return 1 if  $::form->{'{AUTH}admin_password'} && ($::auth->authenticate_root($::form->{'{AUTH}admin_password'})            == $::auth->OK());
+  return 1 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('admin/adminlogin', 'password');

 
 

-  $::auth->delete_session_value('rpw');
-  SL::Dispatcher::show_error('login/password_error', 'password', is_admin => 1);
+  return 0;

 }
 
 1;
 }
 
 1;