[Koha-patches] [PATCH] Bug 8497: Strange behavior when modifying the timeout system preference
Fridolyn SOMERS
fridolyn.somers at biblibre.com
Tue Oct 2 13:49:59 CEST 2012
---
C4/Auth.pm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index 5486f76..eb1474a 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -597,6 +597,15 @@ sub _session_log {
close $fh;
}
+sub _timeout_syspref {
+ my $timeout = C4::Context->preference('timeout') || 600;
+ # value in days, convert in seconds
+ if ($timeout =~ /(\d+)[dD]/) {
+ $timeout = $1 * 86400;
+ };
+ return $timeout;
+}
+
sub checkauth {
my $query = shift;
$debug and warn "Checking Auth";
@@ -607,12 +616,7 @@ sub checkauth {
$type = 'opac' unless $type;
my $dbh = C4::Context->dbh;
- my $timeout = C4::Context->preference('timeout');
- # days
- if ($timeout =~ /(\d+)[dD]/) {
- $timeout = $1 * 86400;
- };
- $timeout = 600 unless $timeout;
+ my $timeout = _timeout_syspref();
_version_check($type,$query);
# state variables
@@ -1058,8 +1062,7 @@ sub check_api_auth {
my $flagsrequired = shift;
my $dbh = C4::Context->dbh;
- my $timeout = C4::Context->preference('timeout');
- $timeout = 600 unless $timeout;
+ my $timeout = _timeout_syspref();
unless (C4::Context->preference('Version')) {
# database has not been installed yet
@@ -1291,8 +1294,7 @@ sub check_cookie_auth {
my $flagsrequired = shift;
my $dbh = C4::Context->dbh;
- my $timeout = C4::Context->preference('timeout');
- $timeout = 600 unless $timeout;
+ my $timeout = _timeout_syspref();
unless (C4::Context->preference('Version')) {
# database has not been installed yet
--
1.7.9.5
More information about the Koha-patches
mailing list