From 203b25ac687a5673f961e1e2e809f0e4294f58bf Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Thu, 2 Jun 2011 12:26:09 +0100 Subject: [PATCH] Bug 6335 Set branch in sip session Content-Type: text/plain; charset="utf-8" The server returns its branch as the institution in the config file However in transactions it will default to the homebranch of the sip user which may not be consistent with that. Needs to set branch in the session if there is a value in config otherwise statistics and behaviour can be wrong (esp in discharge) --- C4/SIP/Sip/MsgType.pm | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm index 508a06b..6c6d75a 100644 --- a/C4/SIP/Sip/MsgType.pm +++ b/C4/SIP/Sip/MsgType.pm @@ -817,7 +817,7 @@ sub login_core ($$$) { $server->{sip_username} = $uid; $server->{sip_password} = $pwd; - my $auth_status = api_auth($uid,$pwd); + my $auth_status = api_auth($uid,$pwd,$inst); if (!$auth_status or $auth_status !~ /^ok$/i) { syslog("LOG_WARNING", "api_auth failed for SIP terminal '%s' of '%s': %s", $uid, $inst, ($auth_status||'unknown')); @@ -1585,17 +1585,17 @@ sub patron_status_string { return $patron_status; } -sub api_auth($$) { - # AUTH - my ($username,$password) = (shift,shift); - $ENV{REMOTE_USER} = $username; - my $query = CGI->new(); - $query->param(userid => $username); - $query->param(password => $password); - my ($status, $cookie, $sessionID) = check_api_auth($query, {circulate=>1}, "intranet"); - # print STDERR "check_api_auth returns " . ($status || 'undef') . "\n"; - # print "api_auth userenv = " . &dump_userenv; - return $status; +sub api_auth { + my ($username,$password, $branch) = @_; + $ENV{REMOTE_USER} = $username; + my $query = CGI->new(); + $query->param(userid => $username); + $query->param(password => $password); + if ($branch) { + $query->param(branch => $branch); + } + my ($status, $cookie, $sessionID) = check_api_auth($query, {circulate=>1}, 'intranet'); + return $status; } 1; -- 1.7.5.2