X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fselectbranchprinter.pl;h=e037e9ec752f34972f0c149cc3696fa3afa428a9;hb=d8a6ffeb2b69b07cabd106d0deefcf93c9e204ae;hp=b5adcfc9ce3db7c7858e44d0d41a05e944f9fdea;hpb=c8df6bdcc9fe2523a77c839270b31304d8e13ee5;p=koha.git

diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index b5adcfc9ce..e037e9ec75 100755
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -4,36 +4,37 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 
 use C4::Context;
 use C4::Output;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Print;  # GetPrinters
 use C4::Koha;
-use C4::Branch; # GetBranches GetBranchesLoop
+
+use Koha::Libraries;
 
 # this will be the script that chooses branch and printer settings....
 
 my $query = CGI->new();
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user({
-    template_name   => "circ/selectbranchprinter.tmpl",
+    template_name   => "circ/selectbranchprinter.tt",
     query           => $query,
     type            => "intranet",
     debug           => 1,
@@ -45,7 +46,6 @@ my $sessionID = $query->cookie("CGISESSID");
 my $session = get_session($sessionID);
 
 # try to get the branch and printer settings from http, fallback to userenv
-my $branches = GetBranches();
 my $printers = GetPrinters();
 my $branch   = $query->param('branch' );
 my $printer  = $query->param('printer');
@@ -56,9 +56,9 @@ my $userenv_printer = C4::Context->userenv->{'branchprinter'} || '';
 my @updated;
 
 # $session lddines here are doing the updating
-if ($branch and $branches->{$branch}) {
+if ( $branch and my $library = Koha::Libraries->find($branch) ) {
     if (! $userenv_branch or $userenv_branch ne $branch ) {
-        my $branchname = GetBranchName($branch);
+        my $branchname = $library->branchname;
         $template->param(LoginBranchname => $branchname);   # update template for new branch
         $template->param(LoginBranchcode => $branch);       # update template for new branch
         $session->param('branchname', $branchname);         # update sesssion in DB
@@ -92,10 +92,6 @@ if ($printer) {
 
 $template->param(updated => \@updated) if (scalar @updated);
 
-unless ($branches->{$branch}) {
-    $branch = (keys %$branches)[0];  # if branch didn't really exist, then replace it w/ one that does
-}
-
 my @printkeys = sort keys %$printers;
 if (scalar(@printkeys) == 1 or not $printers->{$printer}) {
     $printer = $printkeys[0];   # if printer didn't really exist, or there is only 1 anyway, then replace it w/ one that does
@@ -119,7 +115,7 @@ foreach ($query->param()) {
     $_ eq "oldreferer" and next;  # disclude oldreferer
     push @recycle_loop, {
         param => $_,
-        value => $query->param($_),
+        value => scalar $query->param($_),
     };
 }
 
@@ -134,7 +130,7 @@ if (scalar @updated and not scalar @recycle_loop) {
 $template->param(
     referer     => $referer,
     printerloop => \@printerloop,
-    branchloop  => GetBranchesLoop($branch),
+    branch      => $branch,
     recycle_loop=> \@recycle_loop,
 );