projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
admin.pl
diff --git
a/bin/mozilla/admin.pl
b/bin/mozilla/admin.pl
index
2819da0
..
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();
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 {
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",
"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);
}
edit_user_form($myconfig);
}
@@
-650,10
+653,10
@@
sub dbselect_source {
my $form = $main::form;
my $locale = $main::locale;
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->{dbdefault} = 'template1';
- $form->{dbhost} = 'localhost';
+ $form->{dbhost} =
$::auth->{DB_config}->{host} ||
'localhost';
$form->{title} = "Lx-Office ERP / " . $locale->text('Database Administration');
$form->{title} = "Lx-Office ERP / " . $locale->text('Database Administration');