projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dokumentation für Flags in Variablen in Druckvorlagen
[kivitendo-erp.git]
/
bin
/
mozilla
/
login.pl
diff --git
a/bin/mozilla/login.pl
b/bin/mozilla/login.pl
index
03e6dd9
..
d52a69b
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;
@@
-69,8
+68,9
@@
sub run {
$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));
@@
-111,6
+111,12
@@
sub 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();
@@
-183,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();