Bug 19004: [QA Follow-up] No need to check item-level_itypes again

[koha.git] / C4 / InstallAuth.pm

diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm
index 005aea1..9c6795f 100644 (file)
--- a/C4/InstallAuth.pm
+++ b/C4/InstallAuth.pm
@@ -20,6 +20,7 @@ package C4::InstallAuth;
 use strict;
 #use warnings; FIXME - Bug 2505
 use Digest::MD5 qw(md5_base64);
+use File::Spec;
 
 require Exporter;
 use C4::Context;
@@ -30,7 +31,6 @@ use CGI::Session;
 
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-# set the version for version checking
 
 =head1 NAME
 
@@ -234,6 +234,7 @@ sub checkauth {
     my $dbh = C4::Context->dbh();
     my $template_name;
     $template_name = "installer/auth.tt";
+    my $sessdir = File::Spec->catdir( File::Spec->tmpdir, 'cgisess_' . C4::Context->config('database') ); # same construction as in C4/Auth
 
     # state variables
     my $loggedin = 0;
@@ -244,7 +245,7 @@ sub checkauth {
         C4::Context->_new_userenv($sessionID);
         my $session =
           new CGI::Session( "driver:File;serializer:yaml", $sessionID,
-            { Directory => '/tmp' } );
+            { Directory => $sessdir } );
         if ( $session->param('cardnumber') ) {
             C4::Context->set_userenv(
                 $session->param('number'),
@@ -284,7 +285,7 @@ sub checkauth {
     }
     unless ($userid) {
         my $session =
-          new CGI::Session( "driver:File;serializer:yaml", undef, { Directory => '/tmp' } );
+          new CGI::Session( "driver:File;serializer:yaml", undef, { Directory => $sessdir } );
         $sessionID = $session->id;
         $userid    = $query->param('userid');
         C4::Context->_new_userenv($sessionID);
@@ -380,6 +381,10 @@ sub checkauth {
     $template->param( login => 1 );
     $template->param( loginprompt => 1 ) unless $info{'nopermission'};
 
+    if ($info{'invalid_username_or_password'} == 1) {
+                $template->param( 'invalid_username_or_password' => $info{'invalid_username_or_password'});
+    }
+
     $template->param( \%info );
     $cookie = $query->cookie(
         -name    => 'CGISESSID',