X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=b89487c7ef42d61af4a2fa10126ab624e664383d;hb=3a94f4d2dd9a835d4a7007e1b999ea00b3c4e1cd;hp=daae59a23b0c81a5992f1de721c49c68a09fe849;hpb=b1513dccda2a40beac493ae20cf3985af2e88473;p=kivitendo-erp.git

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index daae59a23..b89487c7e 100755
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -32,8 +32,6 @@
 #
 #======================================================================
 
-$menufile = "menu.ini";
-
 use DBI;
 use CGI;
 use English qw(-no_match_vars);
@@ -44,7 +42,9 @@ use POSIX qw(strftime);
 use Sys::Hostname;
 
 use SL::Auth;
+use SL::Auth::PasswordPolicy;
 use SL::Form;
+use SL::Iconv;
 use SL::Mailer;
 use SL::User;
 use SL::Common;
@@ -54,60 +54,55 @@ use SL::DBUtils;
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/admin_groups.pl";
+require "bin/mozilla/admin_printer.pl";
 
-our $cgi = new CGI('');
-
-$form = new Form;
-
-$locale = new Locale $language, "admin";
-
-our $auth = SL::Auth->new();
-if ($auth->session_tables_present()) {
-  $auth->expire_sessions();
-  $auth->restore_session();
-  $auth->set_session_value('rpw', $form->{rpw});
-}
-
-# customization
-if (-f "bin/mozilla/custom_$form->{script}") {
-  eval { require "bin/mozilla/custom_$form->{script}"; };
-  $form->error($@) if ($@);
-}
-
-$form->{stylesheet} = "lx-office-erp.css";
-$form->{favicon}    = "favicon.ico";
-
-if ($form->{action}) {
-  if ($auth->authenticate_root($form->{rpw}, 0) != Auth::OK) {
-    $form->{error_message} = $locale->text('Incorrect Password!');
-    adminlogin();
-    exit;
-  }
+use strict;
 
-  $auth->create_or_refresh_session() if ($auth->session_tables_present());
+our $cgi;
+our $form;
+our $locale;
+our $auth;
 
-  call_sub($locale->findsub($form->{action}));
+sub run {
+  $::lxdebug->enter_sub;
+  my $session_result = shift;
 
-} elsif ($auth->authenticate_root($form->{rpw}, 0) == Auth::OK) {
+  $cgi    = $::cgi;
+  $form   = $::form;
+  $locale = $::locale;
+  $auth   = $::auth;
 
-  $auth->create_or_refresh_session() if ($auth->session_tables_present());
+  $::auth->set_session_value('rpw', $::form->{rpw}) if $session_result == SL::Auth->SESSION_OK;
 
-  login();
+  $form->{stylesheet} = "lx-office-erp.css";
+  $form->{favicon}    = "favicon.ico";
 
-} else {
-  # if there are no drivers bail out
-  $form->error($locale->text('No Database Drivers available!'))
-    unless (User->dbdrivers);
+  if ($form->{action}) {
+    if ($auth->authenticate_root($form->{rpw}, 0) != $auth->OK()) {
+      $form->{error_message} = $locale->text('Incorrect Password!');
+      adminlogin();
+    } else {
+      if ($auth->session_tables_present()) {
+        $::auth->set_session_value('rpw', $::form->{rpw});
+        $::auth->create_or_refresh_session();
+        _apply_dbupgrade_scripts();
+      }
 
-  adminlogin();
+      call_sub($locale->findsub($form->{action}));
+    }
+  } else {
+    # if there are no drivers bail out
+    $form->error($locale->text('No Database Drivers available!'))
+      unless (User->dbdrivers);
 
+    adminlogin();
+  }
+  $::lxdebug->leave_sub;
 }
 
-1;
-
-# end
-
 sub adminlogin {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
   $form->{title} = qq|Lx-Office ERP $form->{version} | . $locale->text('Administration');
 
@@ -121,31 +116,35 @@ sub login {
 }
 
 sub logout {
-  $auth->destroy_session();
+  $main::auth->destroy_session();
   adminlogin();
 }
 
 sub check_auth_db_and_tables {
+  my $form   = $main::form;
+  my $locale = $main::locale;
+
   my %params;
 
-  map { $params{"db_${_}"} = $auth->{DB_config}->{$_} } keys %{ $auth->{DB_config} };
+  map { $params{"db_${_}"} = $main::auth->{DB_config}->{$_} } keys %{ $auth->{DB_config} };
 
-  if (!$auth->check_database()) {
+  if (!$main::auth->check_database()) {
     $form->{title} = $locale->text('Authentification database creation');
     $form->header();
     print $form->parse_html_template('admin/check_auth_database', \%params);
 
-    exit 0;
+    ::end_of_request();
   }
 
-  if (!$auth->check_tables()) {
+  if (!$main::auth->check_tables()) {
     $form->{title} = $locale->text('Authentification tables creation');
     $form->header();
     print $form->parse_html_template('admin/check_auth_tables', \%params);
 
-    exit 0;
+    ::end_of_request();
   }
 
+  my $memberfile = $::lx_office_conf{paths}->{memberfile};
   if (-f $memberfile) {
     my $memberdir = "";
 
@@ -160,24 +159,31 @@ sub check_auth_db_and_tables {
     print $form->parse_html_template('admin/user_migration', { 'memberfile' => $memberfile,
                                                                'backupdir'  => $backupdir });
 
-    exit 0
+    ::end_of_request();
   }
 }
 
 sub create_auth_db {
-  $auth->create_database('superuser'          => $form->{db_superuser},
-                         'superuser_password' => $form->{db_superuser_password},
-                         'template'           => $form->{db_template});
+  my $form = $main::form;
+
+  $main::auth->create_database('superuser'          => $form->{db_superuser},
+                               'superuser_password' => $form->{db_superuser_password},
+                               'template'           => $form->{db_template});
   login();
 }
 
 sub create_auth_tables {
-  $auth->create_tables();
-  $auth->set_session_value('rpw', $form->{rpw});
-  $auth->create_or_refresh_session();
+  my $form   = $main::form;
+  my $locale = $main::locale;
+
+  $main::auth->create_tables();
+  $main::auth->set_session_value('rpw', $form->{rpw});
+  $main::auth->create_or_refresh_session();
 
+  my $memberfile = $::lx_office_conf{paths}->{memberfile};
   if (!-f $memberfile) {
     # New installation -- create a standard group with full access
+    my %members;
     my $group = {
       'name'        => $locale->text('Full Access'),
       'description' => $locale->text('Full access to all functions'),
@@ -185,17 +191,22 @@ sub create_auth_tables {
       'members'     => [ map { $_->{id} } values %members ],
     };
 
-    $auth->save_group($group);
+    $main::auth->save_group($group);
   }
 
+  _apply_dbupgrade_scripts();
   login();
 }
 
 sub migrate_users {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form      = $main::form;
+  my $locale    = $main::locale;
 
   my $memberdir = "";
 
+  my $memberfile = $::lx_office_conf{paths}->{memberfile};
   if ($memberfile =~ m|^.*/|) {
     $memberdir = $&;
   }
@@ -248,8 +259,8 @@ sub migrate_users {
   map { $_->{dbpasswd} = unpack 'u', $_->{dbpasswd} } values %members;
 
   while (my ($login, $params) = each %members) {
-    $auth->save_user($login, %{ $params });
-    $auth->change_password($login, $params->{password}, 1);
+    $main::auth->save_user($login, %{ $params });
+    $main::auth->change_password($login, $params->{password}, 1);
 
     my $conf_file = "${memberdir}${login}.conf";
 
@@ -267,10 +278,13 @@ sub migrate_users {
   $form->header();
   print $form->parse_html_template('admin/user_migration_done', { 'MEMBERS' => \@member_list });
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub create_standard_group_ask {
+  my $form   = $main::form;
+  my $locale = $main::locale;
+
   $form->{title} = $locale->text('Create a standard group');
 
   $form->header();
@@ -278,9 +292,12 @@ sub create_standard_group_ask {
 }
 
 sub create_standard_group {
-  my %members = $auth->read_all_users();
+  my $form    = $main::form;
+  my $locale  = $main::locale;
+
+  my %members = $main::auth->read_all_users();
 
-  my $groups = $auth->read_groups();
+  my $groups  = $main::auth->read_groups();
 
   foreach my $group (values %{$groups}) {
     if (($form->{group_id} != $group->{id})
@@ -296,7 +313,7 @@ sub create_standard_group {
     'members'     => [ map { $_->{id} } values %members ],
   };
 
-  $auth->save_group($group);
+  $main::auth->save_group($group);
 
   user_migration_complete(1);
 }
@@ -308,6 +325,9 @@ sub dont_create_standard_group {
 sub user_migration_complete {
   my $standard_group_created = shift;
 
+  my $form                   = $main::form;
+  my $locale                 = $main::locale;
+
   $form->{title} = $locale->text('User migration complete');
   $form->header();
 
@@ -315,14 +335,17 @@ sub user_migration_complete {
 }
 
 sub list_users {
-  my %members = $auth->read_all_users();
+  my $form    = $main::form;
+  my $locale  = $main::locale;
+
+  my %members = $main::auth->read_all_users();
 
   delete $members{"root login"};
 
   map { $_->{templates} =~ s|.*/||; } values %members;
 
   $form->{title}   = "Lx-Office ERP " . $locale->text('Administration');
-  $form->{LOCKED}  = -e "$userspath/nologin";
+  $form->{LOCKED}  = -e _nologin_file_name();
   $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ];
 
   $form->header();
@@ -330,31 +353,35 @@ sub list_users {
 }
 
 sub add_user {
+  my $form         = $main::form;
+  my $locale       = $main::locale;
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Administration') . " / "
-    . $locale->text('Add User');
+  $form->{title}   = "Lx-Office ERP " . $locale->text('Administration') . " / " . $locale->text('Add User');
 
-  my $myconfig = {
+# Note: Menu Style 'v3' is not compatible to all browsers!
+# "menustyle"    => "old" sets the HTML Menu to default.
+  my $myconfig     = {
     "vclimit"      => 200,
     "countrycode"  => "de",
     "numberformat" => "1.000,00",
     "dateformat"   => "dd.mm.yy",
     "stylesheet"   => "lx-office-erp.css",
-    "menustyle"    => "v3",
+    "menustyle"    => "old",
+    dbport         => $::auth->{DB_config}->{port} || 5432,
+    dbuser         => $::auth->{DB_config}->{user} || 'lxoffice',
+    dbhost         => $::auth->{DB_config}->{host} || 'localhost',
   };
 
+
   edit_user_form($myconfig);
 }
 
 sub edit_user {
+  my $form       = $main::form;
+  my $locale     = $main::locale;
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Administration') . " / "
-    . $locale->text('Edit User');
-  $form->{edit} = 1;
+  $form->{title} = "Lx-Office ERP " . $locale->text('Administration') . " / " . $locale->text('Edit User');
+  $form->{edit}  = 1;
 
   $form->isblank("login", $locale->text("The login is missing."));
 
@@ -370,29 +397,32 @@ sub edit_user {
 sub edit_user_form {
   my ($myconfig) = @_;
 
+  my $form       = $main::form;
+  my $locale     = $main::locale;
+
   my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd);
   $form->{ALL_DATEFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{dateformat} } } @valid_dateformats ];
 
-  my @valid_numberformats = qw(1,000.00 1000.00 1.000,00 1000,00);
+  my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00');
   $form->{ALL_NUMBERFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{numberformat} } } @valid_numberformats ];
 
-  %countrycodes = User->country_codes;
+  my %countrycodes = User->country_codes;
   $form->{ALL_COUNTRYCODES} = [];
-  foreach $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) {
+  foreach my $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) {
     push @{ $form->{ALL_COUNTRYCODES} }, { "value"    => $countrycode,
                                            "name"     => $countrycodes{$countrycode},
                                            "selected" => $countrycode eq $myconfig->{countrycode} };
   }
 
   # is there a templates basedir
-  if (!-d "$templates") {
-    $form->error(sprintf($locale->text("The directory %s does not exist."), $templates));
+  if (!-d $::lx_office_conf{paths}->{templates}) {
+    $form->error(sprintf($locale->text("The directory %s does not exist."), $::lx_office_conf{paths}->{templates}));
   }
 
-  opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $ERRNO");
+  opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO");
   my @all     = readdir(TEMPLATEDIR);
-  my @alldir  = sort grep { -d "$templates/$_" && !/^\.\.?$/ } @all;
-  my @allhtml = sort grep { -f "$templates/$_" && /\.html$/ } @all;
+  my @alldir  = sort grep { -d ($::lx_office_conf{paths}->{templates} . "/$_") && !/^\.\.?$/ } @all;
+  my @allhtml = sort grep { -f ($::lx_office_conf{paths}->{templates} . "/$_") &&  /\.html$/ } @all;
   closedir TEMPLATEDIR;
 
   @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
@@ -404,10 +434,10 @@ sub edit_user_form {
 
   $form->{ALL_TEMPLATES} = [ map { { "name", => $_, "selected" => $_ eq $myconfig->{templates} } } @alldir ];
 
-  $lastitem = $allhtml[0];
+  my $lastitem = $allhtml[0];
   $lastitem =~ s/-.*//g;
   $form->{ALL_MASTER_TEMPLATES} = [ { "name" => $lastitem, "selected" => $lastitem eq "German" } ];
-  foreach $item (@allhtml) {
+  foreach my $item (@allhtml) {
     $item =~ s/-.*//g;
     next if ($item eq $lastitem);
 
@@ -426,8 +456,8 @@ sub edit_user_form {
   my $groups = [];
 
   if ($form->{edit}) {
-    my $user_id    = $auth->get_user_id($form->{login});
-    my $all_groups = $auth->read_groups();
+    my $user_id    = $main::auth->get_user_id($form->{login});
+    my $all_groups = $main::auth->read_groups();
 
     foreach my $group (values %{ $all_groups }) {
       push @{ $groups }, $group if (grep { $user_id == $_ } @{ $group->{members} });
@@ -436,13 +466,16 @@ sub edit_user_form {
     $groups = [ sort { lc $a->{name} cmp lc $b->{name} } @{ $groups } ];
   }
 
-  $form->{CAN_CHANGE_PASSWORD} = $auth->can_change_password();
+  $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
 
   $form->header();
   print $form->parse_html_template("admin/edit_user", { 'GROUPS' => $groups });
 }
 
 sub save_user {
+  my $form          = $main::form;
+  my $locale        = $main::locale;
+
   $form->{dbdriver} = 'Pg';
 
   # no spaces allowed in login name
@@ -451,7 +484,7 @@ sub save_user {
 
   # check for duplicates
   if (!$form->{edit}) {
-    my %members = $auth->read_all_users();
+    my %members = $main::auth->read_all_users();
     if ($members{$form->{login}}) {
       $form->show_generic_error($locale->text('Another user with the login #1 does already exist.', $form->{login}), 'back_button' => 1);
     }
@@ -468,20 +501,20 @@ sub save_user {
   }
 
   # is there a basedir
-  if (!-d "$templates") {
-    $form->error(sprintf($locale->text("The directory %s does not exist."), $templates));
+  if (!-d $::lx_office_conf{paths}->{templates}) {
+    $form->error(sprintf($locale->text("The directory %s does not exist."), $::lx_office_conf{paths}->{templates}));
   }
 
   # add base directory to $form->{templates}
   $form->{templates} =~ s|.*/||;
-  $form->{templates} =  "$templates/$form->{templates}";
+  $form->{templates} =  $::lx_office_conf{paths}->{templates} . "/$form->{templates}";
 
-  $myconfig = new User($form->{login});
+  my $myconfig = new User($form->{login});
 
   $form->isblank("dbname", $locale->text('Dataset missing!'));
   $form->isblank("dbuser", $locale->text('Database User missing!'));
 
-  foreach $item (keys %{$form}) {
+  foreach my $item (keys %{$form}) {
     $myconfig->{$item} = $form->{$item};
   }
 
@@ -492,51 +525,8 @@ sub save_user {
 
   $myconfig->save_member();
 
-  if ($auth->can_change_password()
-      && defined $form->{new_password}
-      && ($form->{new_password} ne '********')) {
-    $auth->change_password($form->{login}, $form->{new_password});
-  }
-
-  if ($webdav) {
-    @webdavdirs =
-      qw(angebote bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen);
-    foreach $directory (@webdavdirs) {
-      $file = "webdav/" . $directory . "/webdav-user";
-      if ($form->{$directory}) {
-        if (open(HTACCESS, "$file")) {
-          while (<HTACCESS>) {
-            ($login, $password) = split(/:/, $_);
-            if ($login ne $form->{login}) {
-              $newfile .= $_;
-            }
-          }
-          close(HTACCESS);
-        }
-        open(HTACCESS, "> $file") or die "cannot open $file $ERRNO\n";
-        $newfile .= $myconfig->{login} . ":" . $myconfig->{password} . "\n";
-        print(HTACCESS $newfile);
-        close(HTACCESS);
-      } else {
-        $form->{$directory} = 0;
-        if (open(HTACCESS, "$file")) {
-          while (<HTACCESS>) {
-            ($login, $password) = split(/:/, $_);
-            if ($login ne $form->{login}) {
-              $newfile .= $_;
-            }
-          }
-          close(HTACCESS);
-        }
-        open(HTACCESS, "> $file") or die "cannot open $file $ERRNO\n";
-        print(HTACCESS $newfile);
-        close(HTACCESS);
-      }
-    }
-  }
-
   $form->{templates}       =~ s|.*/||;
-  $form->{templates}       =  "${templates}/$form->{templates}";
+  $form->{templates}       =  $::lx_office_conf{paths}->{templates} . "/$form->{templates}";
   $form->{mastertemplates} =~ s|.*/||;
 
   # create user template directory and copy master files
@@ -548,20 +538,20 @@ sub save_user {
       umask(007);
 
       # copy templates to the directory
-      opendir TEMPLATEDIR, "$templates/." or $form - error("$templates : $ERRNO");
-      @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|xml|txb)$/,
+      opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO");
+      my @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|odt|xml|txb)$/,
         readdir TEMPLATEDIR;
       closedir TEMPLATEDIR;
 
-      foreach $file (@templates) {
-        open(TEMP, "$templates/$file")
-          or $form->error("$templates/$file : $ERRNO");
+      foreach my $file (@templates) {
+        open(TEMP, $::lx_office_conf{paths}->{templates} . "/$file")
+          or $form->error($::lx_office_conf{paths}->{templates} . "/$file : $ERRNO");
 
         $file =~ s/\Q$form->{mastertemplates}\E-//;
         open(NEW, ">$form->{templates}/$file")
           or $form->error("$form->{templates}/$file : $ERRNO");
 
-        while ($line = <TEMP>) {
+        while (my $line = <TEMP>) {
           print NEW $line;
         }
         close(TEMP);
@@ -574,8 +564,8 @@ sub save_user {
 
   # Add new user to his groups.
   if (ref $form->{new_user_group_ids} eq 'ARRAY') {
-    my $all_groups = $auth->read_groups();
-    my %user       = $auth->read_user($form->{login});
+    my $all_groups = $main::auth->read_groups();
+    my %user       = $main::auth->read_user($form->{login});
 
     foreach my $group_id (@{ $form->{new_user_group_ids} }) {
       my $group = $all_groups->{$group_id};
@@ -583,15 +573,29 @@ sub save_user {
       next if !$group;
 
       push @{ $group->{members} }, $user{id};
-      $auth->save_group($group);
+      $main::auth->save_group($group);
     }
   }
 
-  $form->redirect($locale->text('User saved!'));
+  if ($main::auth->can_change_password()
+      && defined $form->{new_password}
+      && ($form->{new_password} ne '********')) {
+    my $verifier = SL::Auth::PasswordPolicy->new;
+    my $result   = $verifier->verify($form->{new_password}, 1);
+
+    if ($result != SL::Auth::PasswordPolicy->OK()) {
+      $form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result)));
+    }
+
+    $main::auth->change_password($form->{login}, $form->{new_password});
+  }
 
+  $form->redirect($locale->text('User saved!'));
 }
 
 sub save_user_as_new {
+  my $form       = $main::form;
+
   $form->{login} = $form->{new_user_login};
   delete @{$form}{qw(edit new_user_login)};
 
@@ -599,15 +603,18 @@ sub save_user_as_new {
 }
 
 sub delete_user {
-  my %members   = $auth->read_all_users();
+  my $form      = $main::form;
+  my $locale    = $main::locale;
+
+  my %members   = $main::auth->read_all_users();
   my $templates = $members{$form->{login}}->{templates};
 
-  $auth->delete_user($form->{login});
+  $main::auth->delete_user($form->{login});
 
   if ($templates) {
     my $templates_in_use = 0;
 
-    foreach $login (keys %members) {
+    foreach my $login (keys %members) {
       next if $form->{login} eq $login;
       next if $members{$login}->{templates} ne $templates;
       $templates_in_use = 1;
@@ -633,8 +640,7 @@ sub login_name {
 }
 
 sub get_value {
-  my $line = shift;
-
+  my $line           = shift;
   my ($null, $value) = split(/=/, $line, 2);
 
   # remove comments
@@ -647,6 +653,7 @@ sub get_value {
 }
 
 sub pg_database_administration {
+  my $form = $main::form;
 
   $form->{dbdriver} = 'Pg';
   dbselect_source();
@@ -654,10 +661,13 @@ sub pg_database_administration {
 }
 
 sub dbselect_source {
-  $form->{dbport}    = '5432';
-  $form->{dbuser}    = 'postgres';
+  my $form           = $main::form;
+  my $locale         = $main::locale;
+
+  $form->{dbport}    = $::auth->{DB_config}->{port} || 5432;
+  $form->{dbuser}    = $::auth->{DB_config}->{user} || 'lxoffice';
   $form->{dbdefault} = 'template1';
-  $form->{dbhost}    = 'localhost';
+  $form->{dbhost}    = $::auth->{DB_config}->{host} || 'localhost';
 
   $form->{title}     = "Lx-Office ERP / " . $locale->text('Database Administration');
 
@@ -669,6 +679,9 @@ sub dbselect_source {
 }
 
 sub test_db_connection {
+  my $form   = $main::form;
+  my $locale = $main::locale;
+
   $form->{dbdriver} = 'Pg';
   User::dbconnect_vars($form, $form->{dbname});
 
@@ -685,18 +698,14 @@ sub test_db_connection {
 }
 
 sub continue {
-  call_sub($form->{"nextsub"});
-}
-
-sub back {
-  call_sub($form->{"back_nextsub"});
+  call_sub($main::form->{"nextsub"});
 }
 
 sub update_dataset {
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Update Dataset');
+  my $form              = $main::form;
+  my $locale            = $main::locale;
+
+  $form->{title}        = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Update Dataset');
 
   my @need_updates      = User->dbneedsupdate($form);
   $form->{NEED_UPDATES} = \@need_updates;
@@ -707,6 +716,9 @@ sub update_dataset {
 }
 
 sub dbupdate {
+  my $form            = $main::form;
+  my $locale          = $main::locale;
+
   $form->{stylesheet} = "lx-office-erp.css";
   $form->{title}      = $locale->text("Dataset upgrade");
   $form->header();
@@ -725,15 +737,13 @@ sub dbupdate {
 
     map { $form->{$_} = $form->{"${_}_${i}"} } qw(dbname dbdriver dbhost dbport dbuser dbpasswd);
 
-    my $controls = parse_dbupdate_controls($form, $form->{dbdriver});
-
     print $form->parse_html_template("admin/dbupgrade_header");
 
     $form->{dbupdate}        = $form->{dbname};
     $form->{$form->{dbname}} = 1;
 
     User->dbupdate($form);
-    User->dbupdate2($form, $controls);
+    User->dbupdate2($form, SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls);
 
     print $form->parse_html_template("admin/dbupgrade_footer");
   }
@@ -742,12 +752,15 @@ sub dbupdate {
 }
 
 sub create_dataset {
+  my $form           = $main::form;
+  my $locale         = $main::locale;
+
   $form->{dbsources} = join " ", map { "[${_}]" } sort User->dbsources($form);
 
-  $form->{CHARTS} = [];
+  $form->{CHARTS}    = [];
 
-  opendir SQLDIR, "sql/." or $form - error($ERRNO);
-  foreach $item (sort grep /-chart\.sql\z/, readdir SQLDIR) {
+  opendir SQLDIR, "sql/." or $form->error($ERRNO);
+  foreach my $item (sort grep /-chart\.sql\z/, readdir SQLDIR) {
     next if ($item eq 'Default-chart.sql');
     $item =~ s/-chart\.sql//;
     push @{ $form->{CHARTS} }, { "name"     => $item,
@@ -755,12 +768,12 @@ sub create_dataset {
   }
   closedir SQLDIR;
 
-  my $default_charset = $dbcharset;
+  my $default_charset = $::lx_office_conf{system}->{dbcharset};
   $default_charset ||= Common::DEFAULT_CHARSET;
 
   my $cluster_encoding = User->dbclusterencoding($form);
   if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) {
-    if ($dbcharset !~ m/^UTF-?8$/i) {
+    if ($::lx_office_conf{system}->{dbcharset} !~ m/^UTF-?8$/i) {
       $form->show_generic_error($locale->text('The selected  PostgreSQL installation uses UTF-8 as its encoding. ' .
                                               'Therefore you have to configure Lx-Office to use UTF-8 as well.'),
                                 'back_button' => 1);
@@ -778,37 +791,34 @@ sub create_dataset {
     }
   }
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Create Dataset');
+  $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Create Dataset');
 
   $form->header();
   print $form->parse_html_template("admin/create_dataset");
 }
 
 sub dbcreate {
+  my $form   = $main::form;
+  my $locale = $main::locale;
+
   $form->isblank("db", $locale->text('Dataset missing!'));
 
   User->dbcreate(\%$form);
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Create Dataset');
+  $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Create Dataset');
 
   $form->header();
   print $form->parse_html_template("admin/dbcreate");
 }
 
 sub delete_dataset {
-  @dbsources = User->dbsources_unused($form);
+  my $form      = $main::form;
+  my $locale    = $main::locale;
+
+  my @dbsources = User->dbsources_unused($form);
   $form->error($locale->text('Nothing to delete!')) unless @dbsources;
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Delete Dataset');
+  $form->{title}     = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset');
   $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ];
 
   $form->header();
@@ -816,6 +826,8 @@ sub delete_dataset {
 }
 
 sub dbdelete {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
   if (!$form->{db}) {
     $form->error($locale->text('No Dataset selected!'));
@@ -823,22 +835,19 @@ sub dbdelete {
 
   User->dbdelete(\%$form);
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Delete Dataset');
+  $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset');
   $form->header();
   print $form->parse_html_template("admin/dbdelete");
 }
 
 sub backup_dataset {
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Backup Dataset');
+  my $form       = $main::form;
+  my $locale     = $main::locale;
 
-  if ("$pg_dump_exe" eq "DISABLED") {
-    $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
+  $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
+
+  if ($::lx_office_conf{applications}->{pg_dump} eq "DISABLED") {
+    $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
   }
 
   my @dbsources         = sort User->dbsources($form);
@@ -854,15 +863,15 @@ sub backup_dataset {
 }
 
 sub backup_dataset_start {
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Backup Dataset');
+  my $form       = $main::form;
+  my $locale     = $main::locale;
 
-  $pg_dump_exe ||= "pg_dump";
+  $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
+
+  my $pg_dump_exe = $::lx_office_conf{applications}->{pg_dump} || "pg_dump";
 
   if ("$pg_dump_exe" eq "DISABLED") {
-    $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
+    $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
   }
 
   $form->isblank("dbname", $locale->text('The dataset name is missing.'));
@@ -887,7 +896,7 @@ sub backup_dataset_start {
   push @args, ("-p", $form->{dbport}) if ($form->{dbport});
   push @args, $form->{dbname};
 
-  my $cmd  = "${pg_dump_exe} " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
+  my $cmd  = "$pg_dump_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
   my $name = "dataset_backup_$form->{dbname}_" . strftime("%Y%m%d", localtime()) . ".tar";
 
   if ($form->{destination} ne "email") {
@@ -926,17 +935,14 @@ sub backup_dataset_start {
 
     map { $mail->{$_} = $form->{$_} } qw(from to cc subject message);
 
-    $mail->{charset}     = $dbcharset ? $dbcharset : Common::DEFAULT_CHARSET;
+    $mail->{charset}     = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
     $mail->{attachments} = [ { "filename" => $tmp, "name" => $name } ];
     $mail->send();
 
     unlink "${tmpdir}/.pgpass", $tmp;
     rmdir $tmpdir;
 
-    $form->{title} =
-        "Lx-Office ERP "
-      . $locale->text('Database Administration') . " / "
-      . $locale->text('Backup Dataset');
+    $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
 
     $form->header();
     print $form->parse_html_template("admin/backup_dataset_email_done");
@@ -944,16 +950,16 @@ sub backup_dataset_start {
 }
 
 sub restore_dataset {
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Restore Dataset');
+  my $form       = $main::form;
+  my $locale     = $main::locale;
 
-  if ("$pg_restore_exe" eq "DISABLED") {
-    $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
+  $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
+
+  if ($::lx_office_conf{applications}->{pg_restore} eq "DISABLED") {
+    $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
   }
 
-  my $default_charset   = $dbcharset;
+  my $default_charset   = $::lx_office_conf{system}->{dbcharset};
   $default_charset    ||= Common::DEFAULT_CHARSET;
 
   $form->{DBENCODINGS}  = [];
@@ -969,15 +975,15 @@ sub restore_dataset {
 }
 
 sub restore_dataset_start {
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Restore Dataset');
+  my $form       = $main::form;
+  my $locale     = $main::locale;
+
+  $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
 
-  $pg_restore_exe ||= "pg_restore";
+  my $pg_restore_exe = $::lx_office_conf{applications}->{pg_restore} || "pg_restore";
 
   if ("$pg_restore_exe" eq "DISABLED") {
-    $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
+    $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
   }
 
   $form->isblank("new_dbname", $locale->text('The dataset name is missing.'));
@@ -1063,7 +1069,7 @@ sub restore_dataset_start {
   push @args, ("-p", $form->{dbport}) if ($form->{dbport});
   push @args, $tmp;
 
-  my $cmd = "${pg_restore_exe} " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
+  my $cmd = "$pg_restore_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
 
   my $in = IO::File->new("$cmd 2>&1 |");
 
@@ -1074,7 +1080,7 @@ sub restore_dataset_start {
     $form->error($locale->text('The pg_restore process could not be started.'));
   }
 
-  $AUTOFLUSH = 1;
+  $English::AUTOFLUSH = 1;
 
   $form->header();
   print $form->parse_html_template("admin/restore_dataset_start_header");
@@ -1092,8 +1098,10 @@ sub restore_dataset_start {
 }
 
 sub unlock_system {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-  unlink "$userspath/nologin";
+  unlink _nologin_file_name();;
 
   $form->{callback} = "admin.pl?action=list_users";
 
@@ -1102,8 +1110,10 @@ sub unlock_system {
 }
 
 sub lock_system {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-  open(FH, ">$userspath/nologin")
+  open(FH, ">" . _nologin_file_name())
     or $form->error($locale->text('Cannot create Lock!'));
   close(FH);
 
@@ -1114,40 +1124,49 @@ sub lock_system {
 }
 
 sub yes {
-  call_sub($form->{yes_nextsub});
+  call_sub($main::form->{yes_nextsub});
 }
 
 sub no {
-  call_sub($form->{no_nextsub});
+  call_sub($main::form->{no_nextsub});
 }
 
 sub add {
-  call_sub($form->{add_nextsub});
+  call_sub($main::form->{add_nextsub});
 }
 
 sub edit {
+  my $form = $main::form;
+
   $form->{edit_nextsub} ||= 'edit_user';
 
   call_sub($form->{edit_nextsub});
 }
 
 sub delete {
+  my $form     = $main::form;
+
   $form->{delete_nextsub} ||= 'delete_user';
 
   call_sub($form->{delete_nextsub});
 }
 
 sub save {
+  my $form = $main::form;
+
   $form->{save_nextsub} ||= 'save_user';
 
   call_sub($form->{save_nextsub});
 }
 
 sub back {
-  call_sub($form->{back_nextsub});
+  call_sub($main::form->{back_nextsub});
 }
 
 sub dispatcher {
+  my $form   = $main::form;
+  my $locale = $main::locale;
+
   foreach my $action (qw(create_standard_group dont_create_standard_group
                          save_user delete_user save_user_as_new)) {
     if ($form->{"action_${action}"}) {
@@ -1161,4 +1180,12 @@ sub dispatcher {
   $form->error($locale->text('No action defined.'));
 }
 
+sub _apply_dbupgrade_scripts {
+  ::end_of_request() if SL::DBUpgrade2->new(form => $::form, dbdriver => 'Pg', auth => 1)->apply_admin_dbupgrade_scripts(1);
+}
+
+sub _nologin_file_name {
+  return $::lx_office_conf{paths}->{userspath} . '/nologin';
+}
+
 1;