X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Flogin.pl;h=3c90891183c444a67254de8fc1169ad0adf8e1d5;hb=b81f2b8fd88c28f96f49fbe50e94276384d0d511;hp=82d50d7066b8a2dc9602a2c22a119e8ff4f961e5;hpb=bc3eec3a9644923000d380c5721b825c5b714c07;p=kivitendo-erp.git

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 82d50d706..3c9089118 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -37,73 +37,51 @@ require "bin/mozilla/todo.pl";
 
 use strict;
 
-# This is required because the am.pl in the root directory
-# is not scanned by locales.pl:
-# $form->parse_html_template('login/password_error')
+our $cgi;
+our $form;
+our $auth;
 
-our $form = new Form;
+sub run {
+  $::lxdebug->enter_sub;
+  my $session_result = shift;
 
-if (! -f 'config/authentication.pl') {
-  show_error('login/authentication_pl_missing');
-}
-
-our $locale = new Locale $main::language, "login";
-
-our $auth = SL::Auth->new();
-if (!$auth->session_tables_present()) {
-  show_error('login/auth_db_unreachable');
-}
-$auth->expire_sessions();
-my $session_result = $main::auth->restore_session();
-
-# customization
-if (-f "bin/mozilla/custom_$form->{script}") {
-  eval { require "bin/mozilla/custom_$form->{script}"; };
-  $form->error($@) if ($@);
-}
-
-# per login customization
-if (-f "bin/mozilla/$form->{login}_$form->{script}") {
-  eval { require "bin/mozilla/$form->{login}_$form->{script}"; };
-  $form->error($@) if ($@);
-}
-
-# 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}) {
-  $action = 'login';
-}
+  $form   = $::form;
+  $auth   = $::auth;
 
-if ($action) {
-  our %myconfig = $auth->read_user($form->{login}) if ($form->{login});
+  $form->{stylesheet} = "lx-office-erp.css";
+  $form->{favicon}    = "favicon.ico";
 
-  if (!$myconfig{login} || (SL::Auth::OK != $auth->authenticate($form->{login}, $form->{password}, 0))) {
-    $form->{error_message} = $locale->text('Incorrect Password!');
+  if (SL::Auth::SESSION_EXPIRED == $session_result) {
+    $form->{error_message} = $::locale->text('The session is invalid or has expired.');
+    login_screen();
+    ::end_of_request();
+  }
+  my $action = $form->{action};
+  if (!$action && $auth->{SESSION}->{login}) {
+    $action = 'login';
+  }
+  if ($action) {
+    %::myconfig = $auth->read_user(login => $form->{login}) if ($form->{login});
+    $::locale   = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
+
+    if (SL::Auth::OK != $auth->authenticate($::myconfig{login}, $form->{password})) {
+      $form->{error_message} = $::locale->text('Incorrect username or password!');
+      login_screen();
+    } else {
+      $auth->store_credentials_in_session(login => $form->{login}, password => $form->{password});
+      $auth->create_or_refresh_session();
+      delete $form->{password};
+
+      $form->{titlebar} .= " - $::myconfig{name} - $::myconfig{dbname}";
+      call_sub($::locale->findsub($action));
+    }
+  } else {
     login_screen();
-    exit;
   }
 
-  $auth->set_session_value('login', $form->{login}, 'password', $form->{password});
-  $auth->create_or_refresh_session();
-
-  $form->{titlebar} .= " - $myconfig{name} - $myconfig{dbname}";
-  call_sub($locale->findsub($action));
-
-} else {
-  login_screen();
+  $::lxdebug->leave_sub;
 }
 
-1;
-
 sub login_screen {
   $main::lxdebug->enter_sub();
   my ($msg) = @_;
@@ -124,34 +102,49 @@ sub login {
   $main::lxdebug->enter_sub();
 
   unless ($form->{login}) {
-    login_screen($locale->text('You did not enter a name!'));
-    exit;
+    login_screen($::locale->text('You did not enter a name!'));
+    ::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) {
-    exit if $result == -2;
-    login_screen($locale->text('Incorrect username or password!'));
-    exit;
+    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();
   }
 
-  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}} || '';
 
   # made it this far, execute the menu
-  $form->{callback} = build_std_url("script=menu${menu_script}.pl", 'action=display', "callback=" . $form->escape($form->{callback}));
+  # standard redirect does not seem to work for this invocation, (infinite loops?)
+  # do a manual invocation instead
+#  $form->{callback} = build_std_url("script=menu${menu_script}.pl", 'action=display', "callback=" . $form->escape($form->{callback}));
 
   $main::auth->set_cookie_environment_variable();
 
-  $form->redirect();
+  $::form->{script}   = "menu${menu_script}.pl";
+  $::form->{action}   = 'display';
+  $::form->{callback} = $::form->escape($::form->{callback});
+
+  require "bin/mozilla/$::form->{script}";
+  display();
+
+#  $form->redirect();
 
   $main::lxdebug->leave_sub();
 }
@@ -163,7 +156,7 @@ sub logout {
 
   # remove the callback to display the message
   $form->{callback} = "login.pl?action=";
-  $form->redirect($locale->text('You are logged out!'));
+  $form->redirect($::locale->text('You are logged out!'));
 
   $main::lxdebug->leave_sub();
 }
@@ -172,12 +165,11 @@ sub company_logo {
   $main::lxdebug->enter_sub();
 
   my %myconfig = %main::myconfig;
-  $locale             =  new Locale $myconfig{countrycode}, "login" if ($main::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');
+  $form->{title}      =  $::locale->text('kivitendo');
+  $form->{interface}  = $::dispatcher->interface_type;
 
   # create the logo screen
   $form->header() unless $form->{noheader};
@@ -189,17 +181,20 @@ sub company_logo {
 
 sub show_error {
   my $template           = shift;
-  my %myconfig = %main::myconfig;
-  $locale                = Locale->new($main::language, 'all');
-  $myconfig{countrycode} = $main::language;
+  my %myconfig           = %main::myconfig;
+  $myconfig{countrycode} = $::lx_office_conf{system}->{language};
   $form->{stylesheet}    = 'css/lx-office-erp.css';
 
   $form->header();
   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');
 
-  exit;
+  ::end_of_request();
 }
 
+1;
+
+__END__