SKR04-Updates übernommen

[mfinanz.git] / bin / mozilla / admin.pl

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index b1bdcb219a2f39e4b60af9417d64bc20117dbc20..c5c97cd899bbd28d51b3f5d264d8c5120a3f8801 100755 (executable)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -52,6 +52,7 @@ use SL::DBUtils;
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/admin_groups.pl";
+require "bin/mozilla/admin_printer.pl";
 
 use strict;
 
@@ -79,14 +80,12 @@ sub run {
       $form->{error_message} = $locale->text('Incorrect Password!');
       adminlogin();
     } else {
-      $auth->create_or_refresh_session() if ($auth->session_tables_present());
+      if ($auth->session_tables_present()) {
+        $::auth->set_session_value('rpw', $::form->{rpw});
+        $::auth->create_or_refresh_session();
+      }
       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!'))
@@ -648,7 +647,7 @@ sub dbselect_source {
   my $locale         = $main::locale;
 
   $form->{dbport}    = '5432';
-  $form->{dbuser}    = 'postgres';
+  $form->{dbuser}    = 'lxoffice';
   $form->{dbdefault} = 'template1';
   $form->{dbhost}    = 'localhost';