projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nur Erzeugnisse anzeigen beim Klick auf das Fragezeichen bei Erzeugnis fertigen ...
[kivitendo-erp.git]
/
bin
/
mozilla
/
login.pl
diff --git
a/bin/mozilla/login.pl
b/bin/mozilla/login.pl
index
309b3d1
..
0d49058
100644
(file)
--- a/
bin/mozilla/login.pl
+++ b/
bin/mozilla/login.pl
@@
-52,7
+52,7
@@
if (!$auth->session_tables_present()) {
show_error('login/auth_db_unreachable');
}
$auth->expire_sessions();
show_error('login/auth_db_unreachable');
}
$auth->expire_sessions();
-$auth->restore_session();
+
my $session_result =
$auth->restore_session();
# customization
if (-f "bin/mozilla/custom_$form->{script}") {
# customization
if (-f "bin/mozilla/custom_$form->{script}") {
@@
-69,6
+69,12
@@
if (-f "bin/mozilla/$form->{login}_$form->{script}") {
# window title bar, user info
$form->{titlebar} = "Lx-Office " . $locale->text('Version') . " $form->{version}";
# window title bar, user info
$form->{titlebar} = "Lx-Office " . $locale->text('Version') . " $form->{version}";
+if (SL::Auth::SESSION_EXPIRED == $session_result) {
+ $form->{error_message} = $locale->text('The session is invalid or has expired.');
+ login_screen();
+ exit;
+}
+
my $action = $form->{action};
if (!$action && $auth->{SESSION}->{login}) {
my $action = $form->{action};
if (!$action && $auth->{SESSION}->{login}) {
@@
-104,9
+110,8
@@
sub login_screen {
$form->{stylesheet} = "lx-office-erp.css";
}
$form->{stylesheet} = "lx-office-erp.css";
}
- $form->{msg} = $msg;
- $form->{fokus} = "loginscreen.login";
- $form->header;
+ $form->{msg} = $msg;
+ $form->header();
print $form->parse_html_template('login/login_screen');
print $form->parse_html_template('login/login_screen');
@@
-132,6
+137,7
@@
sub login {
my %style_to_script_map = ( 'v3' => 'v3',
'neu' => 'new',
my %style_to_script_map = ( 'v3' => 'v3',
'neu' => 'new',
+ 'js' => 'js',
'xml' => 'XML',
);
'xml' => 'XML',
);
@@
-164,7
+170,7
@@
sub company_logo {
$locale = new Locale $myconfig{countrycode}, "login" if ($language ne $myconfig{countrycode});
$locale = new Locale $myconfig{countrycode}, "login" if ($language ne $myconfig{countrycode});
- $form->{todo_list} =
create_todo_list(
);
+ $form->{todo_list} =
create_todo_list('login_screen' => 1) if (!$form->{no_todo_list}
);
$form->{stylesheet} = $myconfig{stylesheet};
$form->{title} = $locale->text('About');
$form->{stylesheet} = $myconfig{stylesheet};
$form->{title} = $locale->text('About');