Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 98c93d4f4092ed68eb3493f9fc471bff1fa88830..35284db4be23601dc79fb7c46e9a17c7b2c81cae 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -149,16 +149,16 @@ sub handle_request {
   pre_request_checks();
 
   eval {
+    my $session_result = $::auth->restore_session;
+    $::auth->create_or_refresh_session;
+
     $::form->error($::locale->text('System currently down for maintenance!')) if -e "$::userspath/nologin" && $script ne 'admin';
 
     if ($script eq 'login' or $script eq 'admin' or $script eq 'kopf') {
       $::form->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $::form->{version}";
-      ::run($::auth->restore_session);
+      ::run($session_result);
 
     } else {
-      # copy from am.pl routines
-      my $session_result = $::auth->restore_session;
-
       show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
       %::myconfig = $::auth->read_user($::form->{login});
 

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 3a5e810c25a9e713b24f37633cff355295f06112..c5c97cd899bbd28d51b3f5d264d8c5120a3f8801 100755 (executable)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -86,11 +86,6 @@ sub run {
       }
       call_sub($locale->findsub($form->{action}));
     }
-  } elsif ($auth->authenticate_root($form->{rpw}, 0) == $auth->OK()) {
-
-    $auth->create_or_refresh_session() if ($auth->session_tables_present());
-
-    login();
   } else {
     # if there are no drivers bail out
     $form->error($locale->text('No Database Drivers available!'))