arap.pl: merge conflict hatte broken Pod hinterlassen.

[kivitendo-erp.git] / bin / mozilla / admin.pl

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 661de84..eac4d08 100755 (executable)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -84,10 +84,9 @@ sub run {
       if ($auth->session_tables_present()) {
         $::auth->set_session_value('rpw', $::form->{rpw});
         $::auth->create_or_refresh_session();
+        _apply_dbupgrade_scripts();
       }
 
-      _apply_dbupgrade_scripts();
-
       call_sub($locale->findsub($form->{action}));
     }
   } else {
@@ -363,8 +362,12 @@ sub add_user {
     "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',
   };
 
+
   edit_user_form($myconfig);
 }
 
@@ -650,10 +653,10 @@ sub dbselect_source {
   my $form           = $main::form;
   my $locale         = $main::locale;
 
-  $form->{dbport}    = '5432';
-  $form->{dbuser}    = 'lxoffice';
+  $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');
 
@@ -1167,31 +1170,7 @@ sub dispatcher {
 }
 
 sub _apply_dbupgrade_scripts {
-  my $dbh               = $::auth->dbconnect;
-  my $dbdriver          = 'Pg';
-  my $dbupdater         = SL::DBUpgrade2->new(form => $::form, dbdriver => $dbdriver, auth => 1)->parse_dbupdate_controls;
-  my @unapplied_scripts = $dbupdater->unapplied_upgrade_scripts($dbh);
-
-  return if !@unapplied_scripts;
-
-  my $db_charset = $main::dbcharset || Common::DEFAULT_CHARSET;
-  $form->{login} = 'admin';
-
-  map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $dbupdater->{all_controls} };
-
-  $form->{title} = $::locale->text('Dataset upgrade');
-  $form->header;
-  print $form->parse_html_template("dbupgrade/header", { dbname => $::auth->{DB_config}->{db} });
-
-  foreach my $control (@unapplied_scripts) {
-    $::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
-    print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
-
-    $dbupdater->process_file($dbh, "sql/${dbdriver}-upgrade2-auth/$control->{file}", $control, $db_charset);
-  }
-
-  print $form->parse_html_template("dbupgrade/footer", { is_admin => 1, menufile => 'admin.pl' });
-  ::end_of_request();
+  ::end_of_request() if SL::DBUpgrade2->new(form => $::form, dbdriver => 'Pg', auth => 1)->apply_admin_dbupgrade_scripts(1);
 }
 
 1;