MARC import: part 4 of large file support

[koha_fer] / C4 / Auth.pm

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 300a9ed..5db0b8d 100755 (executable)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -263,6 +263,7 @@ sub get_template_and_user {
             IndependantBranches     => C4::Context->preference("IndependantBranches"),
                        CircAutocompl => C4::Context->preference("CircAutocompl"),
                        yuipath => C4::Context->preference("yuipath"),
+                       FRBRizeEditions => C4::Context->preference("FRBRizeEditions"),
         );
     }
     else {
@@ -306,6 +307,7 @@ sub get_template_and_user {
             patronimages           => C4::Context->preference("patronimages"),
             mylibraryfirst   => C4::Context->preference("SearchMyLibraryFirst"),
             "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+                       OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"),
         );
     }
     return ( $template, $borrowernumber, $cookie );
@@ -380,8 +382,11 @@ sub checkauth {
 
     my $dbh     = C4::Context->dbh;
     my $timeout = C4::Context->preference('timeout');
-    $timeout = 600 unless $timeout;
-
+       # days
+       if ($timeout =~ /(\d*)[dD]/) {
+               $timeout = $1 * 86400;
+    };
+       $timeout = 600 unless $timeout;
 
     # If Version syspref is unavailable, it means Koha is beeing installed,
     # and so we must redirect to OPAC maintenance page or to the WebInstaller