Merge remote branch 'origin/master'

[kivitendo-erp.git] / SL / Auth.pm

diff --git a/SL/Auth.pm b/SL/Auth.pm
index 4c50ddf..0a87ca0 100644 (file)
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -121,19 +121,19 @@ sub _read_auth_config {
 
   if (!$self->{authenticator}) {
     my $locale = Locale->new('en');
-    $self->mini_error($locale->text('No or an unknown authenticantion module specified in "config/lx_office.conf".'));
+    $self->mini_error($locale->text('No or an unknown authenticantion module specified in "config/kivitendo.conf".'));
   }
 
   my $cfg = $self->{DB_config};
 
   if (!$cfg) {
     my $locale = Locale->new('en');
-    $self->mini_error($locale->text('config/lx_office.conf: Key "DB_config" is missing.'));
+    $self->mini_error($locale->text('config/kivitendo.conf: Key "DB_config" is missing.'));
   }
 
   if (!$cfg->{host} || !$cfg->{db} || !$cfg->{user}) {
     my $locale = Locale->new('en');
-    $self->mini_error($locale->text('config/lx_office.conf: Missing parameters in "authentication/database". Required parameters are "host", "db" and "user".'));
+    $self->mini_error($locale->text('config/kivitendo.conf: Missing parameters in "authentication/database". Required parameters are "host", "db" and "user".'));
   }
 
   $self->{authenticator}->verify_config();
@@ -149,7 +149,7 @@ sub authenticate_root {
 
   my ($self, $password) = @_;
 
-  my $session_root_auth = $self->get_session_value(SESSION_KEY_ROOT_AUTH);
+  my $session_root_auth = $self->get_session_value(SESSION_KEY_ROOT_AUTH());
   if (defined $session_root_auth && $session_root_auth == OK) {
     $::lxdebug->leave_sub;
     return OK;
@@ -164,9 +164,7 @@ sub authenticate_root {
   my $admin_password    = SL::Auth::Password->hash_if_unhashed(login => 'root', password => $self->{admin_password}->());
 
   my $result = $password eq $admin_password ? OK : ERR_PASSWORD;
-  $self->set_session_value(SESSION_KEY_ROOT_AUTH ,=> $result);
-
-  sleep 5 if $result != OK;
+  $self->set_session_value(SESSION_KEY_ROOT_AUTH() => $result);
 
   $::lxdebug->leave_sub;
   return $result;
@@ -177,7 +175,7 @@ sub authenticate {
 
   my ($self, $login, $password) = @_;
 
-  my $session_auth = $self->get_session_value(SESSION_KEY_USER_AUTH);
+  my $session_auth = $self->get_session_value(SESSION_KEY_USER_AUTH());
   if (defined $session_auth && $session_auth == OK) {
     $::lxdebug->leave_sub;
     return OK;
@@ -189,14 +187,17 @@ sub authenticate {
   }
 
   my $result = $login ? $self->{authenticator}->authenticate($login, $password) : ERR_USER;
-  $self->set_session_value(SESSION_KEY_USER_AUTH ,=> $result, login => $login);
-
-  sleep 5 if $result != OK;
+  $self->set_session_value(SESSION_KEY_USER_AUTH() => $result, login => $login);
 
   $::lxdebug->leave_sub;
   return $result;
 }
 
+sub punish_wrong_login {
+  my $failed_login_penalty = ($::lx_office_conf{authentication} || {})->{failed_login_penalty};
+  sleep $failed_login_penalty if $failed_login_penalty;
+}
+
 sub get_stored_password {
   my ($self, $login) = @_;
 
@@ -488,8 +489,15 @@ sub read_user {
     @user_data{qw(id login)}    = @{$ref}{qw(id login)};
   }
 
-  # The XUL/XML backed menu has been removed.
-  $user_data{menustyle} = 'v3' if lc($user_data{menustyle} || '') eq 'xml';
+  # The XUL/XML & 'CSS new' backed menus have been removed.
+  my %menustyle_map = ( xml => 'new', v4 => 'v3' );
+  $user_data{menustyle} = $menustyle_map{lc($user_data{menustyle} || '')} || $user_data{menustyle};
+
+  # The 'Win2000.css' stylesheet has been removed.
+  $user_data{stylesheet} = 'kivitendo.css' if ($user_data{stylesheet} || '') =~ m/win2000/i;
+
+  # Set default language if selected language does not exist (anymore).
+  $user_data{countrycode} = $::lx_office_conf{system}->{language} unless $user_data{countrycode} && -d "locale/$user_data{countrycode}";
 
   $sth->finish();