X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fselectbranchprinter.pl;h=17a89efb32b33fdd87d44f5162242f454cdffff4;hb=b9ecd6561057ea6551af4d9d84032568c50204a6;hp=130734039416c583ed2912ac9a8b52b853a5e678;hpb=efee891bca8109b23fdf608fb22a1f86efcf2120;p=koha_gimpoz

diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
old mode 100644
new mode 100755
index 1307340394..17a89efb32
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -1,128 +1,118 @@
 #!/usr/bin/perl
 
+# Copyright 2000-2002 Katipo Communications
+#
+# 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 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
 use strict;
 use CGI qw/:standard/;
-use C4::Circulation::Circ2;
+
+use C4::Context;
+use C4::Circulation;
 use C4::Output;
+use C4::Auth;
 use C4::Print;
-use DBI;
-
+use C4::Koha;
+use C4::Branch; # GetBranches
 
-# this is a reorganisation of circulationold.pl 
+# this is a reorganisation of circulationold.pl
 # dividing it up into three scripts......
 # this will be the first one that chooses branch and printer settings....
 
 #general design stuff...
-my $headerbackgroundcolor='#99cc33';
-my $circbackgroundcolor='#ffffcc';
-my $circbackgroundcolor='white';
-my $linecolor1='#ffffcc';
-my $linecolor2='white';
-my $backgroundimage="/images/background-mem.gif";
 
 # try to get the branch and printer settings from the http....
-my %env;
-my $query=new CGI;
-my $branches=getbranches(\%env);
-my $printers=getprinters(\%env);
-my $branch=$query->param('branch');
-my $printer=$query->param('printer');
-
-($branch) || ($branch=$query->cookie('branch'));
-($printer) || ($printer=$query->cookie('printer'));
-
-# is you force a selection....
-my $oldbranch = $branch;
-my $oldprinter = $printer;
+my $query    = new CGI;
+my $branches = GetBranches();
+my $printers = GetPrinters();
+my $branch   = $query->param('branch');
+my $printer  = $query->param('printer');
+
+# set header with cookie....
 
-$branch='';
-$printer='';
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "circ/selectbranchprinter.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { circulate => 1 },
+    }
+);
 
 
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
+($branch)  || ( $branch  = C4::Context->userenv->{'branch'} );
+($printer) || ( $printer = C4::Context->userenv->{'branchprinter'} );
+( $branches->{$branch} )  || ( $branch  = ( keys %$branches )[0] );
+( $printers->{$printer} ) || ( $printer = ( keys %$printers )[0] );
+
+# if you force a selection....
+my $oldbranch  = $branch;
+my $oldprinter = $printer;
 
 # set up select options....
-my $branchcount=0;
-my $printercount=0;
-my $branchoptions;
-my $printeroptions;
-foreach (keys %$branches) {
-    (next) unless ($_);
+my $branchcount  = 0;
+my $printercount = 0;
+my @branchloop;
+foreach my $br ( sort keys %$branches ) {
+    next unless $br =~ /\S/; # next unless $br is not blank.
+
     $branchcount++;
-    my $selected='';
-    ($selected='selected') if ($_ eq $oldbranch);
-    $branchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n";
+    my %branch;
+    $branch{selected} = ( $br eq $oldbranch );
+    $branch{name}     = $branches->{$br}->{'branchname'};
+    $branch{value}    = $br;
+    push( @branchloop, \%branch );
 }
-foreach (keys %$printers) {
-    (next) unless ($_);
+my @printerloop;
+foreach ( keys %$printers ) {
+    (next) unless ($_); # next unless if this printer is blank.
     $printercount++;
-    my $selected='';
-    ($selected='selected') if ($_ eq $oldprinter);
-    $printeroptions.="<option value=$_ $selected>$printers->{$_}->{'printername'}\n";
+    my %printer;
+    $printer{selected} = ( $_ eq $oldprinter );
+    $printer{name}     = $printers->{$_}->{'printername'};
+    $printer{value}    = $_;
+    push( @printerloop, \%printer );
 }
 
 # if there is only one....
-
-if ($printercount==1) {
-    ($printer)=keys %$printers;
+my $printername;
+my $branchname;
+
+my $oneprinter = ( $printercount == 1 );
+my $onebranch  = ( $branchcount == 1 );
+if ( $printercount == 1 ) {
+    my ($tmpprinter) = keys %$printers;
+    $printername = $printers->{$tmpprinter}->{printername};
 }
-if ($branchcount==1) {
-    ($branch)=keys %$branches;
+if ( $branchcount == 1 ) {
+    my ($tmpbranch) = keys %$branches;
+    $branchname = $branches->{$tmpbranch}->{branchname};
 }
 
-# set up printer and branch selection forms....
-my ($printerform, $branchform);
-if ($printercount>1) {
-    $printerform=<<"EOF";
-<select name=printer> $printeroptions </select>
-EOF
-} else {
-    my ($printer) = keys %$printers;
-} 
-
-if ($branchcount>1) {
-    $branchform=<<"EOF";
-<select name=branch> $branchoptions </select>
-EOF
-} else {
-    my ($branch) = keys %$branches;
-} 
-
-
-
-#############################################################################################
+################################################################################
 # Start writing page....
-# set header with cookie....
-
-print $query->header();
-
-print startpage();
-print startmenu('circulation');
-
-print << "EOF";
-<FONT SIZE=6><em>Circulation: Select Printer and Branch Settings</em></FONT><br>
-
-<center>
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<table border=1 cellpadding=5 cellspacing=0>
-<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage>
-<font color=black><b>Please Set Branch and Printer</b></font></td></tr>
-<tr><td>
-$branchform
-</td>
-<td>
-$printerform
-</td></tr>
-</table>
-<input type="submit" value="Change Settings" type="changesettings">
-</form>
-</center>
-
-EOF
-
 
-print endmenu('circulation');
-print endpage();
+$template->param(
+    oneprinter              => $oneprinter,
+    onebranch               => $onebranch,
+    printername             => $printername,
+    branchname              => $branchname,
+    printerloop             => \@printerloop,
+    branchloop              => \@branchloop,
+);
 
+output_html_with_http_headers $query, $cookie, $template->output;