X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=4409505c1f86f184ed69332aaafc5e3a52c5bb92;hb=4a01a26b54aa6a5b97617a8d3fb2dc9b86ceb4c3;hp=a9769a06b6f82b7635f4a73e62b5b64e0766c474;hpb=bd23cc3e64900f14317c147aa52a8b1a7633e2a4;p=kivitendo-erp.git

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
old mode 100644
new mode 100755
index a9769a06b..4409505c1
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -32,885 +32,582 @@
 #
 #======================================================================
 
-$menufile = "menu.ini";
-
 use DBI;
-use CGI;
-
+use Encode;
+use English qw(-no_match_vars);
+use Fcntl;
+use File::Copy;
+use File::Find;
+use File::Spec;
+use Cwd;
+use IO::File;
+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;
+use SL::Inifile;
+use SL::DBUpgrade2;
+use SL::DBUtils;
 
 require "bin/mozilla/common.pl";
+require "bin/mozilla/admin_groups.pl";
+require "bin/mozilla/admin_printer.pl";
+
+use strict;
+
+# parserhappy(R):
+
+#  $locale->text('periodic')
+#  $locale->text('income')
+#  $locale->text('perpetual')
+#  $locale->text('balance')
+
+our $cgi;
+our $form;
+our $locale;
+our $auth;
+
+my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd);
+my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00');
+my @all_stylesheets = qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css);
+my @all_menustyles = (
+  { id => 'old', title => $::locale->text('Old (on the side)') },
+  { id => 'v3',  title => $::locale->text('Top (CSS)') },
+  { id => 'v4',  title => $::locale->text('Top (CSS) new') },
+  { id => 'neu', title => $::locale->text('Top (Javascript)') },
+);
+
+sub run {
+  $::lxdebug->enter_sub;
+  my $session_result = shift;
+
+  $form   = $::form;
+  $locale = $::locale;
+  $auth   = $::auth;
+
+  $form->{stylesheet} = "lx-office-erp.css";
+  $form->{favicon}    = "favicon.ico";
+
+  if ($form->{action}) {
+    if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) {
+      $auth->punish_wrong_login;
+      $form->{error_message} = $locale->text('Incorrect Password!');
+      $auth->delete_session_value('admin_password');
+      adminlogin();
+    } else {
+      if ($auth->session_tables_present()) {
+        delete $::form->{'{AUTH}admin_password'};
+        _apply_dbupgrade_scripts();
+      }
 
-our $cgi = new CGI('');
-
-$form = new Form;
-$form->{"root"} = "root login";
-
-$locale = new Locale $language, "admin";
-
-# 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}) {
-
-
-  $subroutine = $locale->findsub($form->{action});
-
-  if ($subroutine eq 'login') {
-    if ($form->{rpw}) {
-      $form->{rpw} = crypt $form->{rpw}, "ro";
+      call_sub($locale->findsub($form->{action}));
     }
-  }
-
-  check_password();
-
-  call_sub($subroutine);
-
-} else {
-
-  # if there are no drivers bail out
-  $form->error($locale->text('No Database Drivers available!'))
-    unless (User->dbdrivers);
-
-  # create memberfile
-  if (!-f $memberfile) {
-    open(FH, ">$memberfile") or $form->error("$memberfile : $!");
-    print FH qq|# SQL-Ledger Accounting members
-
-[root login]
-password=
+  } else {
+    # if there are no drivers bail out
+    $form->error($locale->text('No Database Drivers available!'))
+      unless (User->dbdrivers);
 
-|;
-    close FH;
+    adminlogin();
   }
-
-  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');
+  $form->{title} = qq|kivitendo $form->{version} | . $locale->text('Administration');
 
   $form->header();
   print $form->parse_html_template('admin/adminlogin');
 }
 
 sub login {
+  check_auth_db_and_tables();
   list_users();
 }
 
-sub list_users {
-
-  $form->error($locale->text('File locked!')) if (-f "${memberfile}.LCK");
+sub logout {
+  $main::auth->destroy_session();
+  adminlogin();
+}
 
-  open(FH, "$memberfile") or $form->error("$memberfile : $!");
+sub check_auth_db_and_tables {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-  my %members;
+  my %params;
 
-  while (<FH>) {
-    chomp;
+  map { $params{"db_${_}"} = $main::auth->{DB_config}->{$_} } keys %{ $auth->{DB_config} };
 
-    if (/^\[.*\]/) {
-      $login = $_;
-      $login =~ s/(\[|\])//g;
-
-      $members{$login} = { "login" => $login };
-    }
+  if (!$main::auth->check_database()) {
+    $form->{title} = $locale->text('Authentification database creation');
+    $form->header();
+    print $form->parse_html_template('admin/check_auth_database', \%params);
 
-    if (/^([a-z]+)=(.*)/) {
-      $members{$login}->{$1} = $2;
-    }
+    ::end_of_request();
   }
 
-  close(FH);
-
-  delete $members{"root login"};
-  map { $_->{templates} =~ s|.*/||; } values %members;
+  if (!$main::auth->check_tables()) {
+    $form->{title} = $locale->text('Authentification tables creation');
+    $form->header();
+    print $form->parse_html_template('admin/check_auth_tables', \%params);
 
-  $form->{title}  = "Lx-Office ERP " . $locale->text('Administration');
-  $form->{LOCKED} = -e "$userspath/nologin";
-  $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ];
+    ::end_of_request();
+  }
 
-  $form->header();
-  print $form->parse_html_template("admin/list_users");
-}
+  my $memberfile = $::lx_office_conf{paths}->{memberfile};
+  if (-f $memberfile) {
+    my $memberdir = "";
 
-sub add_user {
+    if ($memberfile =~ m|^.*/|) {
+      $memberdir = $&;
+    }
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Administration') . " / "
-    . $locale->text('Add User');
+    my $backupdir = "${memberdir}member-file-migration";
 
-  $form->{Oracle_sid}    = $sid;
-  $form->{Oracle_dbport} = '1521';
-  $form->{Oracle_dbhost} = `hostname`;
+    $form->{title} = $locale->text('User data migration');
+    $form->header();
+    print $form->parse_html_template('admin/user_migration', { 'memberfile' => $memberfile,
+                                                               'backupdir'  => $backupdir });
 
-  if (-f "css/lx-office-erp.css") {
-    $myconfig->{stylesheet} = "lx-office-erp.css";
+    ::end_of_request();
   }
+}
 
-  $myconfig->{vclimit}      = 200;
-  $myconfig->{countrycode}  = "de";
-  $myconfig->{numberformat} = "1000,00";
-  $myconfig->{dateformat}   = "dd.mm.yy";
-
-  form_header();
-  form_footer();
+sub create_auth_db {
+  my $form = $main::form;
 
+  $main::auth->create_database('superuser'          => $form->{db_superuser},
+                               'superuser_password' => $form->{db_superuser_password},
+                               'template'           => $form->{db_template});
+  login();
 }
 
-sub edit {
+sub create_auth_tables {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Administration') . " / "
-    . $locale->text('Edit User');
-  $form->{edit} = 1;
+  $main::auth->create_tables();
+  $main::auth->set_session_value('admin_password', $form->{'{AUTH}admin_password'});
+  $main::auth->create_or_refresh_session();
 
-  form_header();
-  form_footer();
+  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'),
+      'rights'      => { map { $_ => 1 } SL::Auth::all_rights() },
+      'members'     => [ map { $_->{id} } values %members ],
+    };
+
+    $main::auth->save_group($group);
+  }
 
+  _apply_dbupgrade_scripts();
+  login();
 }
 
-sub form_footer {
+sub migrate_users {
+  $main::lxdebug->enter_sub();
 
-  if ($form->{edit}) {
-    $delete =
-      qq|<input type=submit class=submit name=action value="|
-      . $locale->text('Delete') . qq|">
-<input type=hidden name=edit value=1>|;
-  }
+  my $form      = $main::form;
+  my $locale    = $main::locale;
 
-  print qq|
+  my $memberdir = "";
 
-<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
-<input type=hidden name=rpw value=$form->{rpw}>
+  my $memberfile = $::lx_office_conf{paths}->{memberfile};
+  if ($memberfile =~ m|^.*/|) {
+    $memberdir = $&;
+  }
 
-<input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">
-$delete
+  my $backupdir = "${memberdir}member-file-migration";
 
-</form>
+  if (! -d $backupdir && !mkdir $backupdir, 0700) {
+    $form->error(sprintf($locale->text('The directory "%s" could not be created:\n%s'), $backupdir, $!));
+  }
 
-</body>
-</html>
-|;
+  copy $memberfile, "users/member-file-migration/members";
 
-}
+  my $in = IO::File->new($memberfile, "r");
 
-sub form_header {
+  $form->error($locale->text('Could not open the old memberfile.')) if (!$in);
 
-  # if there is a login, get user
-  if ($form->{login}) {
+  my (%members, $login);
 
-    # get user
-    $myconfig = new User "$memberfile", "$form->{login}";
+  while (<$in>) {
+    chomp;
 
-    $myconfig->{signature} =~ s/\\n/\r\n/g;
-    $myconfig->{address}   =~ s/\\n/\r\n/g;
+    next if (m/^\s*\#/);
 
-    # strip basedir from templates directory
-    $myconfig->{templates} =~ s/^$templates\///;
+    if (m/^\[.*\]/) {
+      $login = $_;
+      $login =~ s/(\[|\])//g;
+      $login =~ s/^\s*//;
+      $login =~ s/\s*$//;
 
-    # $myconfig->{dbpasswd} = unpack 'u', $myconfig->{dbpasswd};
-  }
+      $members{$login} = { "login" => $login };
+      next;
+    }
 
-  foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
-    $dateformat .=
-      ($item eq $myconfig->{dateformat})
-      ? "<option selected>$item\n"
-      : "<option>$item\n";
-  }
+    if ($login && m/=/) {
+      my ($key, $value) = split m/\s*=\s*/, $_, 2;
+      $key   =~ s|^\s*||;
+      $value =~ s|\s*$||;
 
-  foreach $item (qw(1,000.00 1000.00 1.000,00 1000,00)) {
-    $numberformat .=
-      ($item eq $myconfig->{numberformat})
-      ? "<option selected>$item\n"
-      : "<option>$item\n";
-  }
+      $value =~ s|\\r||g;
+      $value =~ s|\\n|\n|g;
 
-  %countrycodes = User->country_codes;
-  $countrycodes = "";
-  foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
-                keys %countrycodes
-    ) {
-    $countrycodes .=
-      ($myconfig->{countrycode} eq $key)
-      ? "<option selected value=$key>$countrycodes{$key}"
-      : "<option value=$key>$countrycodes{$key}";
+      $members{$login}->{$key} = $value;
+    }
   }
-  $countrycodes = qq|<option value="">American English\n$countrycodes|;
 
-  # is there a templates basedir
-  if (!-d "$templates") {
-    $form->error(  $locale->text('Directory')
-                 . ": $templates "
-                 . $locale->text('does not exist'));
-  }
+  $in->close();
 
-  opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $!");
-  my @all = readdir(TEMPLATEDIR);
-  my @alldir = sort(grep({ -d "$templates/$_" && !/^\.\.?$/ } @all));
-  my @allhtml = sort(grep({ -f "$templates/$_" && /\.html$/ } @all));
-  closedir TEMPLATEDIR;
+  delete $members{"root login"};
 
-  @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
-  @alldir = grep !/^(webpages|\.svn)$/, @alldir;
+  map { $_->{dbpasswd} = unpack 'u', $_->{dbpasswd} } values %members;
 
-  @allhtml = reverse grep !/Default/, @allhtml;
-  push @allhtml, 'Default';
-  @allhtml = reverse @allhtml;
+  while (my ($login, $params) = each %members) {
+    $main::auth->save_user($login, %{ $params });
+    $main::auth->change_password($login, $params->{password}, 1);
 
-  foreach $item (@alldir) {
-    if ($item eq $myconfig->{templates}) {
-      $usetemplates .= qq|<option selected>$item\n|;
-    } else {
-      $usetemplates .= qq|<option>$item\n|;
+    my $conf_file = "${memberdir}${login}.conf";
+
+    if (-f $conf_file) {
+      copy   $conf_file, "${backupdir}/${login}.conf";
+      unlink $conf_file;
     }
   }
 
-  $lastitem = $allhtml[0];
-  $lastitem =~ s/-.*//g;
-  $mastertemplates = qq|<option>$lastitem\n|;
-  foreach $item (@allhtml) {
-    $item =~ s/-.*//g;
+  unlink $memberfile;
 
-    if ($item ne $lastitem) {
-      my $selected = $item eq "German" ? " selected" : "";
-      $mastertemplates .= qq|<option$selected>$item\n|;
-      $lastitem = $item;
-    }
-  }
+  my @member_list = sort { lc $a->{login} cmp lc $b->{login} } values %members;
 
-#  opendir CSS, "css/.";
-#  @all = grep /.*\.css$/, readdir CSS;
-#  closedir CSS;
+  $form->{title} = $locale->text('User data migration');
+  $form->header();
+  print $form->parse_html_template('admin/user_migration_done', { 'MEMBERS' => \@member_list });
 
-# css dir has styles that are not intended as general layouts.
-# reverting to hardcoded list
-  @all = qw(lx-office-erp.css Win2000.css);
+  $main::lxdebug->leave_sub();
+}
 
-  foreach $item (@all) {
-    if ($item eq $myconfig->{stylesheet}) {
-      $selectstylesheet .= qq|<option selected>$item\n|;
-    } else {
-      $selectstylesheet .= qq|<option>$item\n|;
-    }
-  }
+sub create_standard_group_ask {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-  $form->header;
+  $form->{title} = $locale->text('Create a standard group');
 
-  if ($myconfig->{menustyle} eq "v3") {
-    $menustyle_v3 = "checked";
-  } elsif ($myconfig->{menustyle} eq "neu") {
-    $menustyle_neu = "checked";
-  } else {
-    $menustyle_old = "checked";
-  }
+  $form->header();
+  print $form->parse_html_template("admin/create_standard_group_ask");
+}
 
-  print qq|
-<body class=admin>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
-  <tr class=listheading><th colspan=2>$form->{title}</th></tr>
-  <tr size=5></tr>
-  <tr valign=top>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>| . $locale->text('Login') . qq|</th>
-	  <td><input name="login" value="$myconfig->{login}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Password') . qq|</th>
-	  <td><input type="password" name="password" size="8" value="$myconfig->{password}"></td>
-	  <input type="hidden" name="old_password" value="$myconfig->{password}">
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Name') . qq|</th>
-	  <td><input name="name" size="15" value="$myconfig->{name}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('E-mail') . qq|</th>
-	  <td><input name=email size=30 value="$myconfig->{email}"></td>
-	</tr>
-	<tr valign=top>
-	  <th align=right>| . $locale->text('Signature') . qq|</th>
-	  <td><textarea name=signature rows=3 cols=35>$myconfig->{signature}</textarea></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Phone') . qq|</th>
-	  <td><input name=tel size=14 value="$myconfig->{tel}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Fax') . qq|</th>
-	  <td><input name=fax size=14 value="$myconfig->{fax}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Company') . qq|</th>
-	  <td><input name=company size=35 value="$myconfig->{company}"></td>
-	</tr>
-	<tr valign=top>
-	  <th align=right>| . $locale->text('Address') . qq|</th>
-	  <td><textarea name=address rows=4 cols=35>$myconfig->{address}</textarea></td>
-	</tr>
-        <tr valign=top>
-	  <th align=right>| . $locale->text('Tax number') . qq|</th>
-	  <td><input name=taxnumber size=14 value="$myconfig->{taxnumber}"></td>
-	</tr>
-        <tr valign=top>
-	  <th align=right>| . $locale->text('Ust-IDNr') . qq|</th>
-	  <td><input name=co_ustid size=14 value="$myconfig->{co_ustid}"></td>
-	</tr>
-        <tr valign=top>
-	  <th align=right>| . $locale->text('DUNS-Nr') . qq|</th>
-	  <td><input name=duns size=14 value="$myconfig->{duns}"></td>
-	</tr>
-      </table>
-    </td>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>| . $locale->text('Date Format') . qq|</th>
-	  <td><select name=dateformat>$dateformat</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Number Format') . qq|</th>
-	  <td><select name=numberformat>$numberformat</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Dropdown Limit') . qq|</th>
-	  <td><input name=vclimit value="$myconfig->{vclimit}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Language') . qq|</th>
-	  <td><select name=countrycode>$countrycodes</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Stylesheet') . qq|</th>
-	  <td><select name=userstylesheet>$selectstylesheet</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Printer') . qq|</th>
-	  <td><input name=printer size=20 value="$myconfig->{printer}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Use Templates') . qq|</th>
-	  <td><select name=usetemplates>$usetemplates</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('New Templates') . qq|</th>
-	  <td><input name=newtemplates></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Setup Templates') . qq|</th>
-	  <td><select name=mastertemplates>$mastertemplates</select></td>
-	</tr>
-       <tr>
-           <th align=right>| . $locale->text('Setup Menu') . qq|</th>
-           <td><input name=menustyle type=radio class=radio value=v3 $menustyle_v3>&nbsp;| .
-           $locale->text("Top (CSS)") . qq|
-           <input name=menustyle type=radio class=radio value=neu $menustyle_neu>&nbsp;| .
-           $locale->text("Top (Javascript)") . qq|
-           <input name=menustyle type=radio class=radio value=old $menustyle_old>&nbsp;| .
-           $locale->text("Old (on the side)") . qq|
-           </td>
-         </tr>
-	<input type=hidden name=templates value=$myconfig->{templates}>
-      </table>
-    </td>
-  </tr>
-  <tr class=listheading>
-    <th colspan=2>| . $locale->text('Database') . qq|</th>
-  </tr>|;
-
-  # list section for database drivers
-  foreach $item (User->dbdrivers) {
-
-    print qq|
-  <tr>
-    <td colspan=2>
-      <table>
-	<tr>|;
-
-    $checked = "";
-    if ($myconfig->{dbdriver} eq $item) {
-      map { $form->{"${item}_$_"} = $myconfig->{$_} }
-        qw(dbhost dbport dbuser dbpasswd dbname sid);
-      $checked = "checked";
-    }
+sub create_standard_group {
+  my $form    = $main::form;
+  my $locale  = $main::locale;
 
-    print qq|
-	  <th align=right>| . $locale->text('Driver') . qq|</th>
-	  <td><input name="dbdriver" type="radio" class="radio" value="$item" $checked>&nbsp;$item</td>
-	  <th align=right>| . $locale->text('Host') . qq|</th>
-	  <td><input name="${item}_dbhost" size=30 value="$form->{"${item}_dbhost"}"></td>
-	</tr>
-	<tr>|;
-
-    if ($item eq 'Pg') {
-    
-      print qq|
-	  <th align=right>| . $locale->text('Dataset') . qq|</th>
-	  <td><input name="Pg_dbname" size="15" value="$form->{Pg_dbname}"></td>
-	  <th align=right>| . $locale->text('Port') . qq|</th>
-	  <td><input name="Pg_dbport" size="4" value="$form->{Pg_dbport}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('User') . qq|</th>
-	  <td><input name="${item}_dbuser" size=15 value="$form->{"${item}_dbuser"}"></td>
-	  <th align=right>| . $locale->text('Password') . qq|</th>
-	  <td><input name="${item}_dbpasswd" type=password size=10 value="$form->{"${item}_dbpasswd"}"></td>
-	</tr>|;
+  my %members = $main::auth->read_all_users();
 
-    }
+  my $groups  = $main::auth->read_groups();
 
-    if ($item eq 'Oracle') {
-      print qq|
-	  <th align=right>SID</th>
-	  <td><input name=Oracle_sid value=$form->{Oracle_sid}></td>
-	  <th align=right>| . $locale->text('Port') . qq|</th>
-	  <td><input name=Oracle_dbport size=4 value=$form->{Oracle_dbport}></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Dataset') . qq|</th>
-	  <td><input name="${item}_dbuser" size=15 value=$form->{"${item}_dbuser"}></td>
-	  <th align=right>| . $locale->text('Password') . qq|</th>
-	  <td><input name="${item}_dbpasswd" type=password size=10 value="$form->{"${item}_dbpasswd"}"></td>
-
-	</tr>|;
+  foreach my $group (values %{$groups}) {
+    if (($form->{group_id} != $group->{id})
+        && ($form->{name} eq $group->{name})) {
+      $form->show_generic_error($locale->text("A group with that name does already exist."));
     }
+  }
 
-    print qq|
-	<input type="hidden" name="old_dbpasswd" value="$myconfig->{dbpasswd}">
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2><hr size=2 noshade></td>
-  </tr>
-|;
+  my $group = {
+    'name'        => $locale->text('Full Access'),
+    'description' => $locale->text('Full access to all functions'),
+    'rights'      => { map { $_ => 1 } SL::Auth::all_rights() },
+    'members'     => [ map { $_->{id} } values %members ],
+  };
 
-  }
+  $main::auth->save_group($group);
 
-  # access control
-  open(FH, $menufile) or $form->error("$menufile : $!");
+  user_migration_complete(1);
+}
 
-  # scan for first menu level
-  @a = <FH>;
-  close(FH);
+sub dont_create_standard_group {
+  user_migration_complete(0);
+}
 
-  foreach $item (@a) {
-    next unless $item =~ /\[/;
-    next if $item =~ /\#/;
+sub user_migration_complete {
+  my $standard_group_created = shift;
 
-    $item =~ s/(\[|\])//g;
-    chop $item;
+  my $form                   = $main::form;
+  my $locale                 = $main::locale;
 
-    if ($item =~ /--/) {
-      ($level, $menuitem) = split /--/, $item, 2;
-    } else {
-      $level    = $item;
-      $menuitem = $item;
-      push @acsorder, $item;
-    }
+  $form->{title} = $locale->text('User migration complete');
+  $form->header();
 
-    push @{ $acs{$level} }, $menuitem;
+  print $form->parse_html_template('admin/user_migration_complete', { 'standard_group_created' => $standard_group_created });
+}
 
-  }
+sub list_users {
+  my $form    = $main::form;
+  my $locale  = $main::locale;
 
-  %role = ('admin'      => $locale->text('Administrator'),
-           'user'       => $locale->text('User'),
-           'manager'    => $locale->text('Manager'),
-           'supervisor' => $locale->text('Supervisor'));
-
-  $selectrole = "";
-  foreach $item (qw(user supervisor manager admin)) {
-    $selectrole .=
-      ($myconfig->{role} eq $item)
-      ? "<option selected value=$item>$role{$item}\n"
-      : "<option value=$item>$role{$item}\n";
-  }
+  my %members = $main::auth->read_all_users();
 
-  print qq|
-  <tr class=listheading>
-    <th colspan=2>| . $locale->text('Access Control') . qq|</th>
-  </tr>
-  <tr>
-    <td><select name=role>$selectrole</select></td>
-  </tr>
-|;
-
-  foreach $item (split(/;/, $myconfig->{acs})) {
-    ($key, $value) = split /--/, $item, 2;
-    $excl{$key}{$value} = 1;
-  }
+  delete $members{"root login"};
 
-  foreach $key (@acsorder) {
+  for (values %members) {
+    $_->{templates} =~ s|.*/||;
+    $_->{login_url} =  $::locale->is_utf8 ? Encode::encode('utf-8-strict', $_->{login}) : $_->{login_url};
+  }
 
-    $checked = "checked";
-    if ($form->{login}) {
-      $checked = ($excl{$key}{$key}) ? "" : "checked";
-    }
+  $form->{title}   = "kivitendo " . $locale->text('Administration');
+  $form->{LOCKED}  = -e _nologin_file_name();
+  $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ];
 
-    # can't have variable names with spaces
-    # the 1 is for apache 2
-    $item = $form->escape("${key}--$key", 1);
+  $form->header();
+  print $form->parse_html_template("admin/list_users");
+}
 
-    $acsheading = $key;
-    $acsheading =~ s/ /&nbsp;/g;
+sub add_user {
+  $::form->{title}   = "kivitendo " . $::locale->text('Administration') . " / " . $::locale->text('Add User');
+
+# Note: Menu Style 'v3' is not compatible to all browsers!
+# "menustyle"    => "old" sets the HTML Menu to default.
+# User does not have a well behaved new constructor, so we#Ll just have to build one ourself
+  my $user     = bless {
+    "vclimit"      => 200,
+    "countrycode"  => "de",
+    "numberformat" => "1.000,00",
+    "dateformat"   => "dd.mm.yy",
+    "stylesheet"   => "lx-office-erp.css",
+    "menustyle"    => "old",
+    dbport         => $::auth->{DB_config}->{port} || 5432,
+    dbuser         => $::auth->{DB_config}->{user} || 'lxoffice',
+    dbhost         => $::auth->{DB_config}->{host} || 'localhost',
+  }, 'User';
+
+  edit_user_form($user);
+}
 
-    $acsheading = qq|
-    <th align=left><input name="$item" class=checkbox type=checkbox value=1 $checked>&nbsp;$acsheading</th>\n|;
-    $menuitems .= "$item;";
-    $acsdata = "
-    <td>";
+sub edit_user {
+  $::form->{title} = "kivitendo " . $::locale->text('Administration') . " / " . $::locale->text('Edit User');
+  $::form->{edit}  = 1;
 
-    foreach $item (@{ $acs{$key} }) {
-      next if ($key eq $item);
+  # get user
+  my $user = User->new(id => $::form->{user}{id});
 
-      $checked = "checked";
-      if ($form->{login}) {
-        $checked = ($excl{$key}{$item}) ? "" : "checked";
-      }
+  # strip basedir from templates directory
+  $user->{templates} =~ s|.*/||;
 
-      $acsitem = $form->escape("${key}--$item", 1);
+  edit_user_form($user);
+}
 
-      $acsdata .= qq|
-    <br><input name="$acsitem" class=checkbox type=checkbox value=1 $checked>&nbsp;$item|;
-      $menuitems .= "$acsitem;";
-    }
+sub edit_user_form {
+  my ($user) = @_;
 
-    $acsdata .= "
-    </td>";
+  my %cc = $user->country_codes;
+  my @all_countrycodes = map { id => $_, title => $cc{$_} }, sort { $cc{$a} cmp $cc{$b} } keys %cc;
+  my ($all_dir, $all_master) = _search_templates();
+  my $groups = [];
 
-    print qq|
-  <tr valign=top>$acsheading $acsdata
-  </tr>
-|;
-  }
+  if ($::form->{edit}) {
+    my $user_id    = $::auth->get_user_id($user->{login});
+    my $all_groups = $::auth->read_groups();
 
-  print qq|<input type=hidden name=acs value="$menuitems">
-|;
-  if ($webdav) {
-    @webdavdirs =
-      qw(angebote bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen);
-    foreach $directory (@webdavdirs) {
-      if ($myconfig->{$directory}) {
-        $webdav{"${directory}c"} = "checked";
-      } else {
-        $webdav{"${directory}c"} = "";
-      }
+    for my $group (values %{ $all_groups }) {
+      push @{ $groups }, $group if (grep { $user_id == $_ } @{ $group->{members} });
     }
-    print qq|
-   <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-  <tr class=listheading>
-    <th colspan=2>| . $locale->text('WEBDAV-Zugriff') . qq|</th>
-  </tr>
-  <table width=100%>
-	<tr>
-	<td><input name=angebote class=checkbox type=checkbox value=1 $webdav{angebotec}>&nbsp;Angebot</td>
-	<td><input name=bestellungen class=checkbox type=checkbox value=1 $webdav{bestellungenc}>&nbsp;Bestellung</td>
-	<td><input name=rechnungen class=checkbox type=checkbox value=1 $webdav{rechnungenc}>&nbsp;Rechnung</td>
-	</tr>
-	<tr>
-	<td><input name=anfragen class=checkbox type=checkbox value=1 $webdav{anfragenc}>&nbsp;Angebot</td>
-	<td><input name=lieferantenbestellungen class=checkbox type=checkbox value=1 $webdav{lieferantenbestellungenc}>&nbsp;Lieferantenbestellung</td>
-	<td><input name=einkaufsrechnungen class=checkbox type=checkbox value=1 $webdav{einkaufsrechnungenc}>&nbsp;Einkaufsrechnung</td>
-	</tr>
-  </table>
-  <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-|;
+
+    $groups = [ sort { lc $a->{name} cmp lc $b->{name} } @{ $groups } ];
   }
-  print qq|
-</table>
-</div>
-|;
 
+  $::form->header;
+  print $::form->parse_html_template("admin/edit_user", {
+    GROUPS               => $groups,
+    CAN_CHANGE_PASSWORD  => $::auth->can_change_password,
+    user                 => $user->data,
+    all_stylesheets      => \@all_stylesheets,
+    all_numberformats    => \@valid_numberformats,
+    all_dateformats      => \@valid_dateformats,
+    all_countrycodes     => \@all_countrycodes,
+    all_menustyles       => \@all_menustyles,
+    all_templates        => $all_dir,
+    all_master_templates => $all_master,
+  });
 }
 
-sub save {
-
-  # no driver checked
-  $form->error($locale->text('Database Driver not checked!'))
-    unless $form->{dbdriver};
+sub save_user {
+  my $form          = $main::form;
+  my $locale        = $main::locale;
 
-  # no spaces allowed in login name
-  ($form->{login}) = split / /, $form->{login};
+  my $user = $form->{user};
 
-  $form->isblank("login", $locale->text('Login name missing!'));
+  $user->{dbdriver} = 'Pg';
 
-  # check for duplicates
-  if (!$form->{edit}) {
-    $temp = new User "$memberfile", "$form->{login}";
+  if (!$::form->{edit}) {
+    # no spaces allowed in login name
+    $user->{login} =~ s/\s//g;
+    $::form->show_generic_error($::locale->text('Login name missing!')) unless $user->{login};
 
-    if ($temp->{login}) {
-      $form->error("$form->{login} " . $locale->text('is already a member!'));
+    # check for duplicates
+    my %members = $::auth->read_all_users;
+    if ($members{$user->{login}}) {
+      $::form->show_generic_error($locale->text('Another user with the login #1 does already exist.', $user->{login}), 'back_button' => 1);
     }
   }
 
   # no spaces allowed in directories
-  ($form->{newtemplates}) = split / /, $form->{newtemplates};
-
-  if ($form->{newtemplates}) {
-    $form->{templates} = $form->{newtemplates};
-  } else {
-    $form->{templates} =
-      ($form->{usetemplates}) ? $form->{usetemplates} : $form->{login};
-  }
+  ($::form->{newtemplates}) = split / /, $::form->{newtemplates};
+  $user->{templates} = $::form->{newtemplates} || $::form->{usetemplates} || $user->{login};
 
   # is there a basedir
-  if (!-d "$templates") {
-    $form->error(  $locale->text('Directory')
-                 . ": $templates "
-                 . $locale->text('does not exist'));
+  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} = "$templates/$form->{templates}";
-
-  $myconfig = new User "$memberfile", "$form->{login}";
+  $user->{templates} =~ s|.*/||;
+  $user->{templates} =  $::lx_office_conf{paths}->{templates} . "/$user->{templates}";
 
-  # redo acs variable and delete all the acs codes
-  @acs = split(/;/, $form->{acs});
+  my $myconfig = new User(id => $user->{id});
 
-  $form->{acs} = "";
-  foreach $item (@acs) {
-    $item = $form->escape($item, 1);
+  $::form->show_generic_error($::locale->text('Dataset missing!'))       unless $user->{dbname};
+  $::form->show_generic_error($::locale->text('Database User missing!')) unless $user->{dbuser};
 
-    if (!$form->{$item}) {
-      $form->{acs} .= $form->unescape($form->unescape($item)) . ";";
-    }
-    delete $form->{$item};
+  foreach my $item (keys %{$user}) {
+    $myconfig->{$item} = $user->{$item};
   }
 
-  # check which database was filled in
-  if ($form->{dbdriver} eq 'Oracle') {
-    $form->{sid}      = $form->{Oracle_sid},;
-    $form->{dbhost}   = $form->{Oracle_dbhost},;
-    $form->{dbport}   = $form->{Oracle_dbport};
-    $form->{dbpasswd} = $form->{Oracle_dbpasswd};
-    $form->{dbuser}   = $form->{Oracle_dbuser};
-    $form->{dbname}   = $form->{Oracle_dbuser};
-
-    $form->isblank("dbhost", $locale->text('Hostname missing!'));
-    $form->isblank("dbport", $locale->text('Port missing!'));
-    $form->isblank("dbuser", $locale->text('Dataset missing!'));
-  }
-  if ($form->{dbdriver} eq 'Pg') {
-    $form->{dbhost}   = $form->{Pg_dbhost};
-    $form->{dbport}   = $form->{Pg_dbport};
-    $form->{dbpasswd} = $form->{Pg_dbpasswd};
-    $form->{dbuser}   = $form->{Pg_dbuser};
-    $form->{dbname}   = $form->{Pg_dbname};
-
-    $form->isblank("dbname", $locale->text('Dataset missing!'));
-    $form->isblank("dbuser", $locale->text('Database User missing!'));
-  }
+  $myconfig->save_member;
 
-  if ($webdav) {
-    @webdavdirs =
-      qw(angebote bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen);
-    foreach $directory (@webdavdirs) {
-      if ($form->{$directory}) {
-        $form->{$directory} = $form->{$directory};
-      } else {
-        $form->{$directory} = 0;
-      }
-    }
-  }
-
-  foreach $item (keys %{$form}) {
-    $myconfig->{$item} = $form->{$item};
-  }
-
-  delete $myconfig->{stylesheet};
-  if ($form->{userstylesheet}) {
-    $myconfig->{stylesheet} = $form->{userstylesheet};
-  }
-
-  $myconfig->save_member($memberfile, $userspath);
-
-  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 $!\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 $!\n";
-        print(HTACCESS $newfile);
-        close(HTACCESS);
-      }
-    }
-  }
-
-  $form->{templates}       =~ s|.*/||;
-  $form->{templates}       =  "${templates}/$form->{templates}";
-  $form->{mastertemplates} =~ s|.*/||;
+  $user->{templates}       =~ s|.*/||;
+  $user->{templates}       =  $::lx_office_conf{paths}->{templates} . "/$user->{templates}";
+  $::form->{mastertemplates} =~ s|.*/||;
 
   # create user template directory and copy master files
-  if (!-d "$form->{templates}") {
+  if (!-d "$user->{templates}") {
     umask(002);
 
-    if (mkdir "$form->{templates}", oct("771")) {
+    if (mkdir "$user->{templates}", oct("771")) {
 
       umask(007);
 
       # copy templates to the directory
-      opendir TEMPLATEDIR, "$templates/." or $form - error("$templates : $!");
-      @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|xml|txb)$/,
-        readdir TEMPLATEDIR;
-      closedir TEMPLATEDIR;
-
-      foreach $file (@templates) {
-        open(TEMP, "$templates/$file")
-          or $form->error("$templates/$file : $!");
-
-        $file =~ s/$form->{mastertemplates}-//;
-        open(NEW, ">$form->{templates}/$file")
-          or $form->error("$form->{templates}/$file : $!");
-
-        while ($line = <TEMP>) {
-          print NEW $line;
-        }
-        close(TEMP);
-        close(NEW);
-      }
-    } else {
-      $form->error("$!: $form->{templates}");
-    }
-  }
 
-  $form->redirect($locale->text('User saved!'));
+      my $oldcurrdir = getcwd();
+      if (!chdir("$::lx_office_conf{paths}->{templates}/print/$::form->{mastertemplates}")) {
+        $form->error("$ERRNO: chdir $::lx_office_conf{paths}->{templates}/print/$::form->{mastertemplates}");
+      }
 
-}
+      my $newdir = File::Spec->catdir($oldcurrdir, $user->{templates});
 
-sub delete {
+      find(
+        sub
+        {
+          next if ($_ eq ".");
 
-  $form->{templates} =
-    ($form->{templates})
-    ? "$templates/$form->{templates}"
-    : "$templates/$form->{login}";
+          if (-d $_) {
+            if (!mkdir (File::Spec->catdir($newdir, $File::Find::name))) {
+              chdir($oldcurrdir);
+              $form->error("$ERRNO: mkdir $File::Find::name");
+            }
+          } elsif (-l $_) {
+            if (!symlink (readlink($_),
+                          File::Spec->catfile($newdir, $File::Find::name))) {
+              chdir($oldcurrdir);
+              $form->error("$ERRNO: symlink $File::Find::name");
+            }
+          } elsif (-f $_) {
+            if (!copy($_, File::Spec->catfile($newdir, $File::Find::name))) {
+              chdir($oldcurrdir);
+              $form->error("$ERRNO: cp $File::Find::name");
+            }
+          }
+        }, "./");
 
-  $form->error($locale->text('File locked!')) if (-f ${memberfile} . LCK);
-  open(FH, ">${memberfile}.LCK") or $form->error("${memberfile}.LCK : $!");
-  close(FH);
+      chdir($oldcurrdir);
 
-  open(CONF, "+<$memberfile") or $form->error("$memberfile : $!");
+    } else {
+      $form->error("$ERRNO: $user->{templates}");
+    }
+  }
 
-  @config = <CONF>;
+  # Add new user to his groups.
+  if (ref $form->{new_user_group_ids} eq 'ARRAY') {
+    my $all_groups = $main::auth->read_groups();
+    my %user       = $main::auth->read_user(login => $myconfig->{login});
 
-  seek(CONF, 0, 0);
-  truncate(CONF, 0);
+    foreach my $group_id (@{ $form->{new_user_group_ids} }) {
+      my $group = $all_groups->{$group_id};
 
-  while ($line = shift @config) {
+      next if !$group;
 
-    if ($line =~ /^\[/) {
-      last if ($line =~ /\[$form->{login}\]/);
-      $login = login_name($line);
+      push @{ $group->{members} }, $user{id};
+      $main::auth->save_group($group);
     }
+  }
 
-    if ($line =~ /^templates=/) {
-      $user{$login} = get_value($line);
+  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)));
     }
 
-    print CONF $line;
+    $main::auth->change_password($myconfig->{login}, $::form->{new_password});
   }
 
-  # remove everything up to next login or EOF
-  # and save template variable
-  while ($line = shift @config) {
-    if ($line =~ /^templates=/) {
-      $templatedir = get_value($line);
-    }
-    last if ($line =~ /^\[/);
-  }
+  $::form->redirect($::locale->text('User saved!'));
+}
 
-  # this one is either the next login or EOF
-  print CONF $line;
+sub save_user_as_new {
+  my $form       = $main::form;
 
-  $login = login_name($line);
+  $form->{user}{login} = $::form->{new_user_login};
+  delete $form->{user}{id};
+  delete @{$form}{qw(id edit new_user_login)};
 
-  while ($line = shift @config) {
-    if ($line =~ /^\[/) {
-      $login = login_name($line);
-    }
+  save_user();
+}
 
-    if ($line =~ /^templates=/) {
-      $user{$login} = get_value($line);
-    }
+sub delete_user {
+  my $form      = $main::form;
+  my $locale    = $main::locale;
 
-    print CONF $line;
-  }
+  my $user = $::form->{user} || {};
 
-  close(CONF);
-  unlink "${memberfile}.LCK";
+  $::form->show_generic_error($::locale->text('Missing user id!')) unless $user->{id};
 
-  # scan %user for $templatedir
-  foreach $login (keys %user) {
-    last if ($found = ($templatedir eq $user{$login}));
-  }
+  my $loaded_user = User->new(id => $user->{id});
+
+  my %members   = $main::auth->read_all_users();
+  my $templates = $members{$loaded_user->{login}}->{templates};
+
+  $main::auth->delete_user($loaded_user->{login});
 
-  # if found keep directory otherwise delete
-  if (!$found) {
+  if ($templates) {
+    my $templates_in_use = 0;
 
-    # delete it if there is a template directory
-    $dir = "$form->{templates}";
-    if (-d "$dir") {
-      unlink <$dir/*.html>;
-      unlink <$dir/*.tex>;
-      unlink <$dir/*.sty>;
-      rmdir "$dir";
+    foreach my $login (keys %members) {
+      next if $loaded_user->{login} eq $login;
+      next if $members{$login}->{templates} ne $templates;
+      $templates_in_use = 1;
+      last;
     }
-  }
 
-  # delete config file for user
-  unlink "$userspath/$form->{login}.conf";
+    if (!$templates_in_use && -d $templates) {
+      unlink <$templates/*>;
+      rmdir $templates;
+    }
+  }
 
   $form->redirect($locale->text('User deleted!'));
 
@@ -925,8 +622,7 @@ sub login_name {
 }
 
 sub get_value {
-  my $line = shift;
-
+  my $line           = shift;
   my ($null, $value) = split(/=/, $line, 2);
 
   # remove comments
@@ -938,324 +634,336 @@ sub get_value {
   $value;
 }
 
-sub change_admin_password {
+sub pg_database_administration {
+  my $form = $main::form;
 
-  $form->{title} =
-      qq|Lx-Office ERP |
-    . $locale->text('Administration') . " / "
-    . $locale->text('Change Admin Password');
+  $form->{dbdriver} = 'Pg';
+  dbselect_source();
 
-  $form->header();
-  print $form->parse_html_template("admin/change_admin_password");
 }
 
-sub change_password {
-  if ($form->{"password"} ne $form->{"password_again"}) {
-    $form->{title} =
-      qq|Lx-Office ERP |
-      . $locale->text('Administration') . " / "
-      . $locale->text('Change Admin Password');
-
-    $form->header();
-    $form->error($locale->text("The passwords do not match."));
-  }
+sub dbselect_source {
+  my $form           = $main::form;
+  my $locale         = $main::locale;
 
-  $root->{password} = $form->{password};
+  $form->{dbport}    = $::auth->{DB_config}->{port} || 5432;
+  $form->{dbuser}    = $::auth->{DB_config}->{user} || 'lxoffice';
+  $form->{dbdefault} = 'template1';
+  $form->{dbhost}    = $::auth->{DB_config}->{host} || 'localhost';
 
-  $root->{'root login'} = 1;
-  $root->save_member($memberfile);
+  $form->{title}     = "kivitendo / " . $locale->text('Database Administration');
 
-  $form->{callback} =
-    "$form->{script}?action=list_users&rpw=$root->{password}";
+  # Intentionnaly disabled unless fixed to work with the authentication DB.
+  $form->{ALLOW_DBBACKUP} = 0; # "$pg_dump_exe" ne "DISABLED";
 
-  $form->redirect($locale->text('Password changed!'));
+  $form->header();
+  print $form->parse_html_template("admin/dbadmin");
 }
 
-sub check_password {
-  $root = new User "$memberfile", $form->{root};
+sub test_db_connection {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-  if (!defined($root->{password}) || ($root->{password} ne $form->{rpw})) {
-    $form->error($locale->text('Incorrect Password!'));
-  }
+  $form->{dbdriver} = 'Pg';
+  User::dbconnect_vars($form, $form->{dbname});
 
-}
+  my $dbh = DBI->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd});
 
-sub pg_database_administration {
+  $form->{connection_ok} = $dbh ? 1 : 0;
+  $form->{errstr}        = $DBI::errstr;
 
-  $form->{dbdriver} = 'Pg';
-  dbselect_source();
+  $dbh->disconnect() if ($dbh);
 
+  $form->{title} = $locale->text('Database Connection Test');
+  $form->header();
+  print $form->parse_html_template("admin/test_db_connection");
 }
 
-sub oracle_database_administration {
+sub continue {
+  call_sub($main::form->{"nextsub"});
+}
 
-  $form->{dbdriver} = 'Oracle';
-  dbselect_source();
+sub update_dataset {
+  my $form              = $main::form;
+  my $locale            = $main::locale;
 
-}
+  $form->{title}        = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Update Dataset');
 
-sub dbdriver_defaults {
-
-  # load some defaults for the selected driver
-  %driverdefaults = (
-                     'Pg' => { dbport        => '5432',
-                               dbuser        => 'postgres',
-                               dbdefault     => 'template1',
-                               dbhost        => 'localhost',
-                               connectstring => $locale->text('Connect to')
-                     },
-                     'Oracle' => { dbport        => '1521',
-                                   dbuser        => 'oralin',
-                                   dbdefault     => $sid,
-                                   dbhost        => `hostname`,
-                                   connectstring => 'SID'
-                     });
-
-  map { $form->{$_} = $driverdefaults{ $form->{dbdriver} }{$_} }
-    keys %{ $driverdefaults{Pg} };
+  my @need_updates      = User->dbneedsupdate($form);
+  $form->{NEED_UPDATES} = \@need_updates;
+  $form->{ALL_UPDATED}  = !scalar @need_updates;
 
+  $form->header();
+  print $form->parse_html_template("admin/update_dataset");
 }
 
-sub dbselect_source {
+sub dbupdate {
+  my $form            = $main::form;
+  my $locale          = $main::locale;
 
-  dbdriver_defaults();
+  $form->{stylesheet} = "lx-office-erp.css";
+  $form->{title}      = $locale->text("Dataset upgrade");
+  $form->header();
 
-  $msg{Pg} =
-    $locale->text(
-    'Leave host and port field empty unless you want to make a remote connection.'
-    );
-  $msg{Oracle} =
-    $locale->text(
-           'You must enter a host and port for local and remote connections!');
+  my $rowcount           = $form->{rowcount} * 1;
+  my @update_rows        = grep { $form->{"update_$_"} } (1 .. $rowcount);
+  $form->{NOTHING_TO_DO} = !scalar @update_rows;
+  my $saved_form         = save_form();
 
-  $form->{title} =
-    "Lx-Office ERP / " . $locale->text('Database Administration');
+  $| = 1;
 
-  $form->header;
+  print $form->parse_html_template("admin/dbupgrade_all_header");
 
-  print qq|
-<body class=admin>
+  foreach my $i (@update_rows) {
+    restore_form($saved_form);
 
+    %::myconfig = ();
+    map { $form->{$_} = $::myconfig{$_} = $form->{"${_}_${i}"} } qw(dbname dbdriver dbhost dbport dbuser dbpasswd);
 
-<center>
-<h2>$form->{title}</h2>
+    print $form->parse_html_template("admin/dbupgrade_header");
 
-<form method=post action=$form->{script}>
+    $form->{dbupdate}        = $form->{dbname};
+    $form->{$form->{dbname}} = 1;
 
-<table>
-<tr><td>
+    User->dbupdate($form);
+    User->dbupdate2($form, SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls);
 
-<table>
+    print $form->parse_html_template("admin/dbupgrade_footer");
+  }
 
-  <tr class=listheading>
-    <th colspan=4>| . $locale->text('Database') . qq|</th>
-  </tr>
+  print $form->parse_html_template("admin/dbupgrade_all_done");
+}
 
-<input type=hidden name=dbdriver value=$form->{dbdriver}>
+sub create_dataset {
+  my $form           = $main::form;
+  my $locale         = $main::locale;
 
-  <tr><td>
-   <table>
+  $form->{dbsources} = join " ", map { "[${_}]" } sort User->dbsources($form);
 
-  <tr>
+  $form->{CHARTS}    = [];
 
-    <th align=right>| . $locale->text('Host') . qq|</th>
-    <td><input name=dbhost size=25 value=$form->{dbhost}></td>
-    <th align=right>| . $locale->text('Port') . qq|</th>
-    <td><input name=dbport size=5 value=$form->{dbport}></td>
+  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,
+                                 "selected" => $item eq "Germany-DATEV-SKR03EU" };
+  }
+  closedir SQLDIR;
 
-  </tr>
+  $form->{ACCOUNTING_METHODS} = [];
+  foreach my $item ( qw(accrual cash) ) {
+    push @{ $form->{ACCOUNTING_METHODS} }, { "name"     => $item,
+                                 "selected" => $item eq "cash" };
+  };
+
+  $form->{INVENTORY_SYSTEMS} = [];
+  foreach my $item ( qw(perpetual periodic) ) {
+    push @{ $form->{INVENTORY_SYSTEMS} }, { "name"     => $item,
+                                 "selected" => $item eq "periodic" };
+  };
+
+  $form->{PROFIT_DETERMINATIONS} = [];
+  foreach my $item ( qw(balance income) ) {
+    push @{ $form->{PROFIT_DETERMINATIONS} }, { "name"     => $item,
+                                 "selected" => $item eq "income" };
+  };
+
+  my $default_charset = $::lx_office_conf{system}->{dbcharset};
+  $default_charset ||= Common::DEFAULT_CHARSET;
 
-  <tr>
+  my $cluster_encoding = User->dbclusterencoding($form);
+  if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/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);
+    }
 
-    <th align=right>| . $locale->text('User') . qq|</th>
-    <td><input name="dbuser" size="10" value="$form->{dbuser}"></td>
-    <th align=right>| . $locale->text('Password') . qq|</th>
-    <td><input type="password" name="dbpasswd" size="10"></td>
+    $form->{FORCE_DBENCODING} = 'UNICODE';
 
-  </tr>
+  } else {
+    $form->{DBENCODINGS} = [];
 
-  <tr>
+    foreach my $encoding (@Common::db_encodings) {
+      push @{ $form->{DBENCODINGS} }, { "dbencoding" => $encoding->{dbencoding},
+                                        "label"      => $encoding->{label},
+                                        "selected"   => $encoding->{charset} eq $default_charset };
+    }
+  }
 
-    <th align=right>$form->{connectstring}</th>
-    <td colspan=3><input name=dbdefault size=10 value=$form->{dbdefault}></td>
+  $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Create Dataset');
 
-  </tr>
+  $form->header();
+  print $form->parse_html_template("admin/create_dataset");
+}
 
-</table>
+sub dbcreate {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-</td></tr>
-</table>
+  $form->isblank("db", $locale->text('Dataset missing!'));
 
-<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
-<input type=hidden name=rpw value=$form->{rpw}>
+  User->dbcreate(\%$form);
 
-<br>
+  $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Create Dataset');
 
-<input type=submit class=submit name=action value="|
-    . $locale->text('Create Dataset') . qq|">|;
-# Vorübergehend Deaktiviert
-# <input type=submit class=submit name=action value="|
-#     . $locale->text('Update Dataset') . qq|">
-print qq| <input type=submit class=submit name=action value="|
-    . $locale->text('Delete Dataset') . qq|">
+  $form->header();
+  print $form->parse_html_template("admin/dbcreate");
+}
 
-</form>
+sub delete_dataset {
+  my $form      = $main::form;
+  my $locale    = $main::locale;
 
-</td></tr>
-</table>
+  my @dbsources = User->dbsources_unused($form);
+  $form->error($locale->text('Nothing to delete!')) unless @dbsources;
 
-<p>|
-    . $locale->text(
-    'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!'
-    )
+  $form->{title}     = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset');
+  $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ];
 
-    . qq|
-<br>$msg{$form->{dbdriver}}
+  $form->header();
+  print $form->parse_html_template("admin/delete_dataset");
+}
 
+sub dbdelete {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-</body>
-</html>
-|;
+  if (!$form->{db}) {
+    $form->error($locale->text('No Dataset selected!'));
+  }
 
-}
+  User->dbdelete(\%$form);
 
-sub continue {
-  call_sub($form->{"nextsub"});
+  $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset');
+  $form->header();
+  print $form->parse_html_template("admin/dbdelete");
 }
 
-sub update_dataset {
+sub backup_dataset {
+  my $form       = $main::form;
+  my $locale     = $main::locale;
 
-  %needsupdate = User->dbneedsupdate(\%$form);
+  $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Update Dataset');
+  if ($::lx_office_conf{applications}->{pg_dump} eq "DISABLED") {
+    $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
+  }
 
-  $form->header;
+  my @dbsources         = sort User->dbsources($form);
+  $form->{DATABASES}    = [ map { { "dbname" => $_ } } @dbsources ];
+  $form->{NO_DATABASES} = !scalar @dbsources;
 
-  print qq|
-<body class=admin>
+  my $username  = getpwuid $UID || "unknown-user";
+  my $hostname  = hostname() || "unknown-host";
+  $form->{from} = "kivitendo Admin <${username}\@${hostname}>";
 
+  $form->header();
+  print $form->parse_html_template("admin/backup_dataset");
+}
 
-<center>
-<h2>$form->{title}</h2>
-|;
-  my $field_id = 0;
-  foreach $key (sort keys %needsupdate) {
-    if ($needsupdate{$key} ne $form->{dbversion}) {
-      $upd .= qq|<input id="$field_id" name="db$key" type="checkbox" value="1" checked> $key\n|;
-      $form->{dbupdate} .= "db$key ";
-      $field_id++;
-    }
-  }
+sub backup_dataset_start {
+  my $form       = $main::form;
+  my $locale     = $main::locale;
 
-  chop $form->{dbupdate};
+  $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
 
-  if ($form->{dbupdate}) {
+  my $pg_dump_exe = $::lx_office_conf{applications}->{pg_dump} || "pg_dump";
 
-    print qq|
-<table width=100%>
-<form method=post action=$form->{script}>
+  if ("$pg_dump_exe" eq "DISABLED") {
+    $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
+  }
 
-<input type=hidden name="dbdriver"  value="$form->{dbdriver}">
-<input type=hidden name="dbhost"    value="$form->{dbhost}">
-<input type=hidden name="dbport"    value="$form->{dbport}">
-<input type=hidden name="dbuser"    value="$form->{dbuser}">
-<input type=hidden name="dbpasswd"  value="$form->{dbpasswd}">
-<input type=hidden name="dbdefault" value="$form->{dbdefault}">
+  $form->isblank("dbname", $locale->text('The dataset name is missing.'));
+  $form->isblank("to", $locale->text('The email address is missing.')) if $form->{destination} eq "email";
 
-<tr class=listheading>
-  <th>| . $locale->text('The following Datasets need to be updated') . qq|</th>
-</tr>
-<tr>
-<td>
+  my $tmpdir = "/tmp/lx_office_backup_" . Common->unique_id();
+  mkdir $tmpdir, 0700 || $form->error($locale->text('A temporary directory could not be created:') . " $ERRNO");
 
-$upd
+  my $pgpass = IO::File->new("${tmpdir}/.pgpass", O_WRONLY | O_CREAT, 0600);
 
-</td>
-</tr>
-<tr>
-<td>
+  if (!$pgpass) {
+    unlink $tmpdir;
+    $form->error($locale->text('A temporary file could not be created:') . " $ERRNO");
+  }
 
-<input name=dbupdate type=hidden value="$form->{dbupdate}">
+  print $pgpass "$form->{dbhost}:$form->{dbport}:$form->{dbname}:$form->{dbuser}:$form->{dbpasswd}\n";
+  $pgpass->close();
 
-<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
+  $ENV{HOME} = $tmpdir;
 
-<input type=hidden name=rpw value=$form->{rpw}>
+  my @args = ("-Ft", "-c", "-o", "-h", $form->{dbhost}, "-U", $form->{dbuser});
+  push @args, ("-p", $form->{dbport}) if ($form->{dbport});
+  push @args, $form->{dbname};
 
-<input type=hidden name=nextsub value=dbupdate>
+  my $cmd  = "$pg_dump_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
+  my $name = "dataset_backup_$form->{dbname}_" . strftime("%Y%m%d", localtime()) . ".tar";
 
-<hr size=3 noshade>
+  if ($form->{destination} ne "email") {
+    my $in = IO::File->new("$cmd |");
 
-<br>
-<input type=submit class=submit name=action value="|
-      . $locale->text('Continue') . qq|">
+    if (!$in) {
+      unlink "${tmpdir}/.pgpass";
+      rmdir $tmpdir;
 
-</td></tr>
-</table>
-</form>
-|;
+      $form->error($locale->text('The pg_dump process could not be started.'));
+    }
 
-  } else {
+    print "content-type: application/x-tar\n";
+    print "content-disposition: attachment; filename=\"${name}\"\n\n";
 
-    print $locale->text('All Datasets up to date!');
+    while (my $line = <$in>) {
+      print $line;
+    }
 
-  }
+    $in->close();
 
-  print qq|
+    unlink "${tmpdir}/.pgpass";
+    rmdir $tmpdir;
 
-</body>
-</html>
-|;
+  } else {
+    my $tmp = $tmpdir . "/dump_" . Common::unique_id();
 
-}
+    if (system("$cmd > $tmp") != 0) {
+      unlink "${tmpdir}/.pgpass", $tmp;
+      rmdir $tmpdir;
 
-sub dbupdate {
-  $form->{"stylesheet"} = "lx-office-erp.css";
-  $form->{"title"} = $main::locale->text("Dataset upgrade");
-  $form->header();
-  my $dbname =
-    join(" ",
-         map({ s/\s//g; s/^db//; $_; }
-             grep({ $form->{$_} }
-                  split(/\s+/, $form->{"dbupdate"}))));
-  print($form->parse_html_template("dbupgrade/header",
-                                   { "dbname" => $dbname }));
+      $form->error($locale->text('The pg_dump process could not be started.'));
+    }
 
-  User->dbupdate(\%$form);
+    my $mail = new Mailer;
 
-  print qq|
-<hr>
+    map { $mail->{$_} = $form->{$_} } qw(from to cc subject message);
 
-| . $locale->text('Dataset updated!') . qq|
+    $mail->{charset}     = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
+    $mail->{attachments} = [ { "filename" => $tmp, "name" => $name } ];
+    $mail->send();
 
-<br>
+    unlink "${tmpdir}/.pgpass", $tmp;
+    rmdir $tmpdir;
 
-<a id="enddatasetupdate" href="admin.pl?action=login&| .
-join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(rpw))) .
-qq|">| . $locale->text("Continue") . qq|</a>|;
+    $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
 
+    $form->header();
+    print $form->parse_html_template("admin/backup_dataset_email_done");
+  }
 }
 
-sub create_dataset {
-  $form->{dbsources} = join " ", map { "[${_}]" } sort User->dbsources(\%$form);
+sub restore_dataset {
+  my $form       = $main::form;
+  my $locale     = $main::locale;
 
-  $form->{CHARTS} = [];
+  $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
 
-  opendir SQLDIR, "sql/." or $form - error($!);
-  foreach $item (sort grep /-chart\.sql\z/, readdir SQLDIR) {
-    next if ($item eq 'Default-chart.sql');
-    $item =~ s/-chart\.sql//;
-    push @{ $form->{CHARTS} }, { "name"     => $item,
-                                 "selected" => $item eq "Germany-DATEV-SKR03EU" };
+  if ($::lx_office_conf{applications}->{pg_restore} eq "DISABLED") {
+    $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
   }
-  closedir SQLDIR;
 
-  my $default_charset = $dbcharset;
-  $default_charset ||= Common::DEFAULT_CHARSET;
+  my $default_charset   = $::lx_office_conf{system}->{dbcharset};
+  $default_charset    ||= Common::DEFAULT_CHARSET;
 
-  $form->{DBENCODINGS} = [];
+  $form->{DBENCODINGS}  = [];
 
   foreach my $encoding (@Common::db_encodings) {
     push @{ $form->{DBENCODINGS} }, { "dbencoding" => $encoding->{dbencoding},
@@ -1263,80 +971,249 @@ sub create_dataset {
                                       "selected"   => $encoding->{charset} eq $default_charset };
   }
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Create Dataset');
-
   $form->header();
-  print $form->parse_html_template("admin/create_dataset");
+  print $form->parse_html_template("admin/restore_dataset");
 }
 
-sub dbcreate {
-  $form->isblank("db", $locale->text('Dataset missing!'));
+sub restore_dataset_start {
+  my $form       = $main::form;
+  my $locale     = $main::locale;
 
-  User->dbcreate(\%$form);
+  $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Create Dataset');
+  my $pg_restore_exe = $::lx_office_conf{applications}->{pg_restore} || "pg_restore";
 
-  $form->header();
-  print $form->parse_html_template("admin/dbcreate");
-}
+  if ("$pg_restore_exe" eq "DISABLED") {
+    $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
+  }
 
-sub delete_dataset {
-  @dbsources = User->dbsources_unused(\%$form, $memberfile);
-  $form->error($locale->text('Nothing to delete!')) unless @dbsources;
+  $form->isblank("new_dbname", $locale->text('The dataset name is missing.'));
+  $form->isblank("content", $locale->text('No backup file has been uploaded.'));
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Delete Dataset');
-  $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ];
+  # Create temporary directories. Write the backup file contents to a temporary
+  # file. Create a .pgpass file with the username and password for the pg_restore
+  # utility.
 
-  $form->header();
-  print $form->parse_html_template("admin/delete_dataset");
-}
+  my $tmpdir = "/tmp/lx_office_backup_" . Common->unique_id();
+  mkdir $tmpdir, 0700 || $form->error($locale->text('A temporary directory could not be created:') . " $ERRNO");
 
-sub dbdelete {
+  my $pgpass = IO::File->new("${tmpdir}/.pgpass", O_WRONLY | O_CREAT, 0600);
 
-  if (!$form->{db}) {
-    $form->error($locale->text('No Dataset selected!'));
+  if (!$pgpass) {
+    unlink $tmpdir;
+    $form->error($locale->text('A temporary file could not be created:') . " $ERRNO");
   }
 
-  User->dbdelete(\%$form);
+  print $pgpass "$form->{dbhost}:$form->{dbport}:$form->{new_dbname}:$form->{dbuser}:$form->{dbpasswd}\n";
+  $pgpass->close();
+
+  $ENV{HOME} = $tmpdir;
+
+  my $tmp = $tmpdir . "/dump_" . Common::unique_id();
+  my $tmpfile;
+
+  if (substr($form->{content}, 0, 2) eq "\037\213") {
+    $tmpfile = IO::File->new("| gzip -d > $tmp");
+    $tmpfile->binary();
+
+  } else {
+    $tmpfile = IO::File->new($tmp, O_WRONLY | O_CREAT | O_BINARY, 0600);
+  }
+
+  if (!$tmpfile) {
+    unlink "${tmpdir}/.pgpass";
+    rmdir $tmpdir;
+
+    $form->error($locale->text('A temporary file could not be created:') . " $ERRNO");
+  }
+
+  print $tmpfile $form->{content};
+  $tmpfile->close();
+
+  delete $form->{content};
+
+  # Try to connect to the database. Find out if a database with the same name exists.
+  # If yes, then drop the existing database. Create a new one with the name and encoding
+  # given by the user.
+
+  User::dbconnect_vars($form, "template1");
+
+  my %myconfig = map { $_ => $form->{$_} } grep /^db/, keys %{ $form };
+  my $dbh      = $form->dbconnect(\%myconfig) || $form->dberror();
+
+  my ($query, $sth);
 
-  $form->{title} =
-      "Lx-Office ERP "
-    . $locale->text('Database Administration') . " / "
-    . $locale->text('Delete Dataset');
+  $form->{new_dbname} =~ s|[^a-zA-Z0-9_\-]||g;
+
+  $query = qq|SELECT COUNT(*) FROM pg_database WHERE datname = ?|;
+  my ($count) = selectrow_query($form, $dbh, $query, $form->{new_dbname});
+  if ($count) {
+    do_query($form, $dbh, qq|DROP DATABASE $form->{new_dbname}|);
+  }
+
+  my $found = 0;
+  foreach my $item (@Common::db_encodings) {
+    if ($item->{dbencoding} eq $form->{dbencoding}) {
+      $found = 1;
+      last;
+    }
+  }
+  $form->{dbencoding} = "LATIN9" unless $form->{dbencoding};
+
+  do_query($form, $dbh, qq|CREATE DATABASE $form->{new_dbname} ENCODING ? TEMPLATE template0|, $form->{dbencoding});
+
+  $dbh->disconnect();
+
+  # Spawn pg_restore on the temporary file.
+
+  my @args = ("-h", $form->{dbhost}, "-U", $form->{dbuser}, "-d", $form->{new_dbname});
+  push @args, ("-p", $form->{dbport}) if ($form->{dbport});
+  push @args, $tmp;
+
+  my $cmd = "$pg_restore_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
+
+  my $in = IO::File->new("$cmd 2>&1 |");
+
+  if (!$in) {
+    unlink "${tmpdir}/.pgpass", $tmp;
+    rmdir $tmpdir;
+
+    $form->error($locale->text('The pg_restore process could not be started.'));
+  }
+
+  $English::AUTOFLUSH = 1;
 
   $form->header();
-  print $form->parse_html_template("admin/dbdelete");
+  print $form->parse_html_template("admin/restore_dataset_start_header");
+
+  while (my $line = <$in>) {
+    print $line;
+  }
+  $in->close();
+
+  $form->{retval} = $CHILD_ERROR >> 8;
+  print $form->parse_html_template("admin/restore_dataset_start_footer");
+
+  unlink "${tmpdir}/.pgpass", $tmp;
+  rmdir $tmpdir;
 }
 
 sub unlock_system {
+  my $form   = $main::form;
+  my $locale = $main::locale;
 
-  unlink "$userspath/nologin";
+  unlink _nologin_file_name();;
 
-  $form->{callback} =
-    "$form->{script}?action=list_users&rpw=$root->{password}";
+  $form->{callback} = "admin.pl?action=list_users";
 
   $form->redirect($locale->text('Lockfile removed!'));
 
 }
 
 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);
 
-  $form->{callback} =
-    "$form->{script}?action=list_users&rpw=$root->{password}";
+  $form->{callback} = "admin.pl?action=list_users";
 
   $form->redirect($locale->text('Lockfile created!'));
 
 }
+
+sub yes {
+  call_sub($main::form->{yes_nextsub});
+}
+
+sub no {
+  call_sub($main::form->{no_nextsub});
+}
+
+sub add {
+  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($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}"}) {
+      call_sub($action);
+      return;
+    }
+  }
+
+  call_sub($form->{default_action}) if ($form->{default_action});
+
+  $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';
+}
+
+sub _search_templates {
+  # is there a templates basedir
+  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, $::lx_office_conf{paths}->{templates} or $::form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO");
+  my @all     = readdir(TEMPLATEDIR);
+  my @alldir  = sort grep { -d ($::lx_office_conf{paths}->{templates} . "/$_") && !/^\.\.?$/ } @all;
+  closedir TEMPLATEDIR;
+
+  @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
+  @alldir = grep !/^(webpages|print|\.svn)$/, @alldir;
+
+  # mastertemplates
+  opendir TEMPLATEDIR, "$::lx_office_conf{paths}->{templates}/print" or $::form->error("$::lx_office_conf{paths}->{templates}/print" . " : $ERRNO");
+  my @allmaster = readdir(TEMPLATEDIR);
+  closedir TEMPLATEDIR;
+
+  @allmaster  = sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ } @allmaster;
+  @allmaster = reverse grep !/Default/, @allmaster;
+  push @allmaster, 'Default';
+  @allmaster = reverse @allmaster;
+
+  return \@alldir, \@allmaster;
+}
+
+1;