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 'GewichtinVerkaufsbericht'
[kivitendo-erp.git]
/
bin
/
mozilla
/
admin.pl
diff --git
a/bin/mozilla/admin.pl
b/bin/mozilla/admin.pl
index
6f3d709
..
4409505
100755
(executable)
--- a/
bin/mozilla/admin.pl
+++ b/
bin/mozilla/admin.pl
@@
-91,20
+91,18
@@
sub run {
$locale = $::locale;
$auth = $::auth;
$locale = $::locale;
$auth = $::auth;
- $::auth->store_root_credentials_in_session($form->{rpw}) if $session_result == SL::Auth->SESSION_OK;
-
$form->{stylesheet} = "lx-office-erp.css";
$form->{favicon} = "favicon.ico";
if ($form->{action}) {
$form->{stylesheet} = "lx-office-erp.css";
$form->{favicon} = "favicon.ico";
if ($form->{action}) {
- if ($auth->authenticate_root($form->{rpw}) != $auth->OK()) {
+ if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) {
+ $auth->punish_wrong_login;
$form->{error_message} = $locale->text('Incorrect Password!');
$form->{error_message} = $locale->text('Incorrect Password!');
- $auth->delete_session_value('
rpw
');
+ $auth->delete_session_value('
admin_password
');
adminlogin();
} else {
if ($auth->session_tables_present()) {
adminlogin();
} else {
if ($auth->session_tables_present()) {
- $::auth->store_root_credentials_in_session($::form->{rpw});
- delete $::form->{rpw};
+ delete $::form->{'{AUTH}admin_password'};
_apply_dbupgrade_scripts();
}
_apply_dbupgrade_scripts();
}
@@
-197,7
+195,7
@@
sub create_auth_tables {
my $locale = $main::locale;
$main::auth->create_tables();
my $locale = $main::locale;
$main::auth->create_tables();
- $main::auth->set_session_value('
rpw', $form->{rpw
});
+ $main::auth->set_session_value('
admin_password', $form->{'{AUTH}admin_password'
});
$main::auth->create_or_refresh_session();
my $memberfile = $::lx_office_conf{paths}->{memberfile};
$main::auth->create_or_refresh_session();
my $memberfile = $::lx_office_conf{paths}->{memberfile};