Neuen Mandantennamen erst nach letztem Filtern erstellen

[mfinanz.git] / SL / Controller / LoginScreen.pm

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index 50cae1816d18f762fbb8bff30b7d40884ac8b80e..385ce6fdd5f2568885f3aea94dacc5d7a09ba24a 100644 (file)
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -65,17 +65,24 @@ sub action_login {
   # if we get an error back, bale out
   my $result = User->new(login => $::myconfig{login})->login($::form);
 
   # if we get an error back, bale out
   my $result = User->new(login => $::myconfig{login})->login($::form);
 

-  # Database update available?
-  ::end_of_request() if -2 == $result;
-

   # Auth DB needs update? If so log the user out forcefully.
   # Auth DB needs update? If so log the user out forcefully.

-  if (-3 == $result) {
+  if (User::LOGIN_AUTH_DBUPDATE_AVAILABLE() == $result) {

     $::auth->destroy_session;
     return $self->render('login_screen/auth_db_needs_update');
   }
 
     $::auth->destroy_session;
     return $self->render('login_screen/auth_db_needs_update');
   }
 

+  # Basic client tables available? If not tell the user to create them
+  # and log the user out forcefully.
+  if (User::LOGIN_BASIC_TABLES_MISSING() == $result) {
+    $::auth->destroy_session;
+    return $self->render('login_screen/basic_tables_missing');
+  }
+
+  # Database update available?
+  ::end_of_request() if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
+

   # Other login errors.
   # Other login errors.

-  if (0 > $result) {
+  if (User::LOGIN_OK() != $result) {

     $::auth->punish_wrong_login;
     return $self->show_login_form(error => $error);
   }
     $::auth->punish_wrong_login;
     return $self->show_login_form(error => $error);
   }