X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=2da3ba58ab6e57b7ca61739b6ccafcb76ddebaab;hb=2b260ba4ae39d5827145f8aed03f5afeb62e36ad;hp=2819da00ed8372d802635940d177141c7ef80414;hpb=2da6fbfbbb3c708bd7a33057026e369b1be61bc3;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 2819da00e..2da3ba58a 100755 --- 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 { @@ -192,6 +191,7 @@ sub create_auth_tables { $main::auth->save_group($group); } + _apply_dbupgrade_scripts(); login(); } @@ -363,8 +363,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 +654,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');