From 0419aed02d1c0bb45bca6842d01a709adce9b820 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Tue, 3 May 2016 10:36:15 +0000
Subject: [PATCH] Bug 16429 - Fix root problem
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Heather Braum <hbraum@nekls.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 640b9585f82ff898bebcebd01efab81bca311588)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 circ/circulation.pl                           | 24 ++-----------------
 .../prog/en/includes/patron-search-box.inc    |  5 ----
 .../prog/en/modules/circ/circulation.tt       |  2 --
 members/routing-lists.pl                      | 17 ++-----------
 4 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 56ed41a0c9..7658670d4e 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -62,24 +62,7 @@ my $query = new CGI;
 
 my $sessionID = $query->cookie("CGISESSID") ;
 my $session = get_session($sessionID);
-
-# 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){
+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");
@@ -154,8 +137,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) {
@@ -594,8 +576,6 @@ $template->param(
     categoryname      => $borrower->{'description'},
     branch            => $branch,
     branchname        => GetBranchName($borrower->{'branchcode'}),
-    printer           => $printer,
-    printername       => $printer,
     was_renewed       => $query->param('was_renewed') ? 1 : 0,
     expiry            => $borrower->{'dateexpiry'},
     roadtype          => $roadtype,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
index 82fd9e0d36..9e9227e199 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
@@ -1,4 +1,3 @@
-[% USE Branches %]
 [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %][% IF ( CircAutocompl ) %]<script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -28,8 +27,6 @@ $(document).ready(function(){
     <div class="autocomplete">
                 <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="head-searchbox focus" type="text" />
                 <input id="autocsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" />
-                <input name="printer" value="" type="hidden" />
             [% IF ( stickyduedate ) %]
                 <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
                 <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
@@ -37,8 +34,6 @@ $(document).ready(function(){
         </div>
 	[% ELSE %]
             <input id="findborrower" name="findborrower" size="40" class="head-searchbox focus" type="text" />
-            <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" />
-            <input name="printer" value="" type="hidden" />
             [% IF ( stickyduedate ) %]
             <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
             <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
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 59e67e7294..ae65cbb771 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -562,7 +562,6 @@ No patron matched <span class="ex">[% message %]</span>
 
 [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
     <input type="hidden" name="branch" value="[% branch %]" />
-    <input type="hidden" name="printer" value="[% printer %]" />
     <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
     <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
 
@@ -684,7 +683,6 @@ No patron matched <span class="ex">[% message %]</span>
 
           <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
           <input type="hidden" name="branch" value="[% branch %]" />
-          <input type="hidden" name="printer" value="[% printer %]" />
           <input type="hidden" name="print" value="maybe" />
           <input type="hidden" name="debt_confirmed" value="[% debt_confirmed %]" />
                 [% IF ( CHARGES ) %]
diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index a68ef404d5..3b8e3fabf0 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);
@@ -31,19 +31,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',
@@ -61,7 +48,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.39.5