projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Existierende benutzer mit der richtigen id laden.
[kivitendo-erp.git]
/
bin
/
mozilla
/
login.pl
diff --git
a/bin/mozilla/login.pl
b/bin/mozilla/login.pl
index
49cb6c6
..
b5b0f17
100644
(file)
--- a/
bin/mozilla/login.pl
+++ b/
bin/mozilla/login.pl
@@
-45,7
+45,6
@@
sub run {
$::lxdebug->enter_sub;
my $session_result = shift;
$::lxdebug->enter_sub;
my $session_result = shift;
- $cgi = $::cgi;
$form = $::form;
$auth = $::auth;
$form = $::form;
$auth = $::auth;
@@
-62,15
+61,16
@@
sub run {
$action = 'login';
}
if ($action) {
$action = 'login';
}
if ($action) {
- %::myconfig = $auth->read_user($form->{login}) if ($form->{login});
+ %::myconfig = $auth->read_user(
login =>
$form->{login}) if ($form->{login});
$::locale = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
$::locale = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
- if (
!$::myconfig{login} || (SL::Auth::OK != $auth->authenticate($form->{login}, $form->{password}, 0)
)) {
+ if (
SL::Auth::OK != $auth->authenticate($::myconfig{login}, $form->{password}
)) {
$form->{error_message} = $::locale->text('Incorrect username or password!');
login_screen();
} else {
$form->{error_message} = $::locale->text('Incorrect username or password!');
login_screen();
} else {
- $auth->s
et_session_value('login', $form->{login}, 'password',
$form->{password});
+ $auth->s
tore_credentials_in_session(login => $form->{login}, password =>
$form->{password});
$auth->create_or_refresh_session();
$auth->create_or_refresh_session();
+ delete $form->{password};
$form->{titlebar} .= " - $::myconfig{name} - $::myconfig{dbname}";
call_sub($::locale->findsub($action));
$form->{titlebar} .= " - $::myconfig{name} - $::myconfig{dbname}";
call_sub($::locale->findsub($action));
@@
-106,21
+106,27
@@
sub login {
::end_of_request();
}
::end_of_request();
}
- my $user =
new User $form->{login}
;
+ my $user =
User->new(login => $form->{login})
;
# if we get an error back, bale out
my $result;
if (($result = $user->login($form)) <= -1) {
# if we get an error back, bale out
my $result;
if (($result = $user->login($form)) <= -1) {
+ if ($result == -3) {
+ show_error('login/auth_db_needs_update');
+ $::auth->destroy_session;
+ ::end_of_request();
+ }
+
::end_of_request() if $result == -2;
login_screen($::locale->text('Incorrect username or password!'));
::end_of_request();
}
::end_of_request() if $result == -2;
login_screen($::locale->text('Incorrect username or password!'));
::end_of_request();
}
- my %style_to_script_map = (
'v3' => 'v3',
-
'neu' => 'new
',
-
'v4' => 'v4
',
-
'xml' => 'XML
',
-
);
+ my %style_to_script_map = (
+
v3 => 'v3
',
+
neu => 'new
',
+
v4 => 'v4
',
+ );
my $menu_script = $style_to_script_map{$user->{menustyle}} || '';
my $menu_script = $style_to_script_map{$user->{menustyle}} || '';
@@
-163,6
+169,7
@@
sub company_logo {
$form->{stylesheet} = $myconfig{stylesheet};
$form->{title} = $::locale->text('Lx-Office');
$form->{stylesheet} = $myconfig{stylesheet};
$form->{title} = $::locale->text('Lx-Office');
+ $form->{interface} = $::dispatcher->interface_type;
# create the logo screen
$form->header() unless $form->{noheader};
# create the logo screen
$form->header() unless $form->{noheader};
@@
-182,6
+189,7
@@
sub show_error {
print $form->parse_html_template($template);
# $form->parse_html_template('login/auth_db_unreachable');
print $form->parse_html_template($template);
# $form->parse_html_template('login/auth_db_unreachable');
+ # $form->parse_html_template('login/auth_db_needs_update');
# $form->parse_html_template('login/authentication_pl_missing');
::end_of_request();
# $form->parse_html_template('login/authentication_pl_missing');
::end_of_request();