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 ssh://git-sdonath@lx-office.linet-services.de/~/lx-office...
[kivitendo-erp.git]
/
bin
/
mozilla
/
admin.pl
diff --git
a/bin/mozilla/admin.pl
b/bin/mozilla/admin.pl
index
b1bdcb2
..
3a5e810
100755
(executable)
--- a/
bin/mozilla/admin.pl
+++ b/
bin/mozilla/admin.pl
@@
-52,6
+52,7
@@
use SL::DBUtils;
require "bin/mozilla/common.pl";
require "bin/mozilla/admin_groups.pl";
require "bin/mozilla/common.pl";
require "bin/mozilla/admin_groups.pl";
+require "bin/mozilla/admin_printer.pl";
use strict;
use strict;
@@
-79,7
+80,10
@@
sub run {
$form->{error_message} = $locale->text('Incorrect Password!');
adminlogin();
} else {
$form->{error_message} = $locale->text('Incorrect Password!');
adminlogin();
} else {
- $auth->create_or_refresh_session() if ($auth->session_tables_present());
+ if ($auth->session_tables_present()) {
+ $::auth->set_session_value('rpw', $::form->{rpw});
+ $::auth->create_or_refresh_session();
+ }
call_sub($locale->findsub($form->{action}));
}
} elsif ($auth->authenticate_root($form->{rpw}, 0) == $auth->OK()) {
call_sub($locale->findsub($form->{action}));
}
} elsif ($auth->authenticate_root($form->{rpw}, 0) == $auth->OK()) {
@@
-648,7
+652,7
@@
sub dbselect_source {
my $locale = $main::locale;
$form->{dbport} = '5432';
my $locale = $main::locale;
$form->{dbport} = '5432';
- $form->{dbuser} = '
postgres
';
+ $form->{dbuser} = '
lxoffice
';
$form->{dbdefault} = 'template1';
$form->{dbhost} = 'localhost';
$form->{dbdefault} = 'template1';
$form->{dbhost} = 'localhost';