html menü rewrite v1

[mfinanz.git] / SL / Dispatcher / AuthHandler / Admin.pm

diff --git a/SL/Dispatcher/AuthHandler/Admin.pm b/SL/Dispatcher/AuthHandler/Admin.pm
index 5a92015f545129d4c81c14ad6f1984800ea98300..77202e8e40ac31183b5b802aee9ee5b6a934869f 100644 (file)
--- a/SL/Dispatcher/AuthHandler/Admin.pm
+++ b/SL/Dispatcher/AuthHandler/Admin.pm
@@ -7,10 +7,12 @@ use parent qw(Rose::Object);
 sub handle {
   %::myconfig = ();
 
 sub handle {
   %::myconfig = ();
 

-  return if $::auth->authenticate_root($::auth->get_session_value('rpw')) == $::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());

 
 

-  $::auth->delete_session_value('rpw');
-  SL::Dispatcher::show_error('login/password_error', 'password', is_admin => 1);
+  $::auth->punish_wrong_login;
+  $::auth->delete_session_value('admin_password');
+  SL::Dispatcher::show_error('admin/adminlogin', 'password');

 }
 
 1;
 }
 
 1;