From e0a26531dccf2af303d82606608f74dd0f632513 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 3 May 2016 10:36:15 +0000 Subject: [PATCH] Bug 16429 - Fix root problem The root of this issue is old code in circulation.pl that is no longer needed and leaves the affected scripts open to future regressions. --- circ/circulation.pl | 28 ++++------------------ .../prog/en/modules/circ/circulation.tt | 2 -- members/routing-lists.pl | 17 ++----------- 3 files changed, 6 insertions(+), 41 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index c2d9399..0562df5 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -65,29 +65,12 @@ use List::MoreUtils qw/uniq/; # my $query = new CGI; -my $sessionID = $query->cookie("CGISESSID") ; -my $session = get_session($sessionID); - my $override_high_holds = $query->param('override_high_holds'); my $override_high_holds_tmp = $query->param('override_high_holds_tmp'); -# branch and printer are now defined by the userenv -# but first we have to check if someone has tried to change them - -my $branch = $query->param('branch'); -if ($branch){ - # update our session so the userenv is updated - $session->param('branch', $branch); - $session->param('branchname', GetBranchName($branch)); -} - -my $printer = $query->param('printer'); -if ($printer){ - # update our session so the userenv is updated - $session->param('branchprinter', $printer); -} - -if (!C4::Context->userenv && !$branch){ +my $sessionID = $query->cookie("CGISESSID") ; +my $session = get_session($sessionID); +if (!C4::Context->userenv){ if ($session->param('branch') eq 'NO_LIBRARY_SET'){ # no branch set we can't issue print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl"); @@ -162,8 +145,7 @@ for (@failedreturns) { $return_failed{$_} = 1; } my $findborrower = $query->param('findborrower') || q{}; $findborrower =~ s|,| |g; -$branch = C4::Context->userenv->{'branch'}; -$printer = C4::Context->userenv->{'branchprinter'}; +my $branch = C4::Context->userenv->{'branch'}; # If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian if (C4::Context->preference("AutoLocation") != 1) { @@ -650,8 +632,6 @@ $template->param( categoryname => $borrower->{'description'}, branch => $branch, branchname => GetBranchName($borrower->{'branchcode'}), - printer => $printer, - printername => $printer, was_renewed => scalar $query->param('was_renewed') ? 1 : 0, expiry => $borrower->{'dateexpiry'}, roadtype => $roadtype, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index b1e4c9d..1bfe4cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -598,7 +598,6 @@ No patron matched [% message %] [% IF (forceallow) %][% END %] - @@ -738,7 +737,6 @@ No patron matched [% message %] - [% IF ( CHARGES ) %] diff --git a/members/routing-lists.pl b/members/routing-lists.pl index 1925880..c8377db 100755 --- a/members/routing-lists.pl +++ b/members/routing-lists.pl @@ -21,7 +21,7 @@ use strict; #use warnings; FIXME - Bug 2505 use CGI qw ( -utf8 ); use C4::Output; -use C4::Auth qw/:DEFAULT get_session/; +use C4::Auth qw/:DEFAULT/; use C4::Branch; # GetBranches use C4::Members; use C4::Members::Attributes qw(GetBorrowerAttributes); @@ -32,19 +32,6 @@ use CGI::Session; my $query = new CGI; -my $sessionID = $query->cookie("CGISESSID") ; -my $session = get_session($sessionID); - -# branch are now defined by the userenv -# but first we have to check if someone has tried to change them - -my $branch = $query->param('branch'); -if ($branch){ - # update our session so the userenv is updated - $session->param('branch', $branch); - $session->param('branchname', GetBranchName($branch)); -} - my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( { template_name => 'members/routing-lists.tt', @@ -62,7 +49,7 @@ $findborrower =~ s|,| |g; my $borrowernumber = $query->param('borrowernumber'); -$branch = C4::Context->userenv->{'branch'}; +my $branch = C4::Context->userenv->{'branch'}; # get the borrower information..... my $borrower; -- 2.1.4