X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Flogin.pl;h=7488dd18cf5f69f2213fdaeda68a14eb22f5008d;hb=018e340ac9f0fc9c4b0bd180bd195e7c0fbd3c0e;hp=9df72327ee15fd80cab162a3ee1757c0a1d46d6f;hpb=64e47b819d746158d520a028abf73c87da14212e;p=kivitendo-erp.git

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 9df72327e..7488dd18c 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -33,6 +33,7 @@ use SL::User;
 use SL::Form;
 
 require "bin/mozilla/common.pl";
+require "bin/mozilla/todo.pl";
 
 # This is required because the am.pl in the root directory
 # is not scanned by locales.pl:
@@ -51,7 +52,7 @@ if (!$auth->session_tables_present()) {
   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}") {
@@ -68,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}";
 
+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}) {
@@ -103,9 +110,8 @@ sub login_screen {
     $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');
 
@@ -163,6 +169,8 @@ sub company_logo {
 
   $locale             =  new Locale $myconfig{countrycode}, "login" if ($language ne $myconfig{countrycode});
 
+  $form->{todo_list}  =  create_todo_list('login_screen' => 1) if (!$form->{no_todo_list});
+
   $form->{stylesheet} =  $myconfig{stylesheet};
   $form->{title}      =  $locale->text('About');
 
@@ -188,3 +196,4 @@ sub show_error {
 
   exit;
 }
+